Fix permissions
- typo uid on gid
- add contrail users for database and collector too
Change-Id: I3f914f29f627a128fd690be0eb0ad815e52f508b
diff --git a/opencontrail/collector.sls b/opencontrail/collector.sls
index 8930565..4a0a748 100644
--- a/opencontrail/collector.sls
+++ b/opencontrail/collector.sls
@@ -74,13 +74,20 @@
{%- endif %}
{%- if collector.version >= 4.0 %}
+user_contrail_collector:
+ user.present:
+ - name: contrail
+ - system: True
+
docker-compose-contrail-collector-env:
file.managed:
- name: /etc/docker/compose/opencontrail/contrail.env
- contents:
- "CONTRAIL_UID={{ salt['user.info']('contrail').get('uid', 0) }}"
- - "CONTRAIL_GID={{ salt['user.info']('contrail').get('uid', 0) }}"
+ - "CONTRAIL_GID={{ salt['user.info']('contrail').get('gid', 0) }}"
- makedirs: true
+ - require:
+ - user: user_contrail_collector
{%- endif %}
{%- if collector.version == 3.0 %}
diff --git a/opencontrail/control.sls b/opencontrail/control.sls
index 266ab5b..2d7c54c 100644
--- a/opencontrail/control.sls
+++ b/opencontrail/control.sls
@@ -75,7 +75,7 @@
- name: /etc/docker/compose/opencontrail/contrail.env
- contents:
- "CONTRAIL_UID={{ salt['user.info']('contrail').get('uid', 0) }}"
- - "CONTRAIL_GID={{ salt['user.info']('contrail').get('uid', 0) }}"
+ - "CONTRAIL_GID={{ salt['user.info']('contrail').get('gid', 0) }}"
- makedirs: true
- require:
- user: user_contrail
diff --git a/opencontrail/database.sls b/opencontrail/database.sls
index 9b2e06b..417efed 100644
--- a/opencontrail/database.sls
+++ b/opencontrail/database.sls
@@ -61,13 +61,20 @@
- template: jinja
- makedirs: true
+user_contrail_database:
+ user.present:
+ - name: contrail
+ - system: True
+
docker-compose-contrail-database-env:
file.managed:
- name: /etc/docker/compose/opencontrail/contrail.env
- contents:
- "CONTRAIL_UID={{ salt['user.info']('contrail').get('uid', 0) }}"
- - "CONTRAIL_GID={{ salt['user.info']('contrail').get('uid', 0) }}"
+ - "CONTRAIL_GID={{ salt['user.info']('contrail').get('gid', 0) }}"
- makedirs: true
+ - require:
+ - user: user_contrail_database
{% endif %}
{{ database.cassandra_config }}logback.xml: