Unhardcode glance user/group uid/gid values
Warn to not change glance uid/gid values after user is created
Change-Id: Iff3e6490c14134c3cda12035578dd153b1621aea
diff --git a/README.rst b/README.rst
index c791b9a..04f22eb 100644
--- a/README.rst
+++ b/README.rst
@@ -17,6 +17,8 @@
enabled: true
version: juno
workers: 8
+ glance_uid: 302
+ glance_gid: 302
policy:
publicize_image:
- "role:admin"
diff --git a/glance/map.jinja b/glance/map.jinja
index 6483c9b..d011473 100644
--- a/glance/map.jinja
+++ b/glance/map.jinja
@@ -7,7 +7,9 @@
'cors': {},
'audit': {
'enabled': false
- }
+ },
+ 'glance_uid': 302,
+ 'glance_gid': 302
},
'RedHat': {
'pkgs': ['openstack-glance', 'python-glanceclient','python-pycadf'],
@@ -16,7 +18,9 @@
'cors': {},
'audit': {
'enabled': false
- }
+ },
+ 'glance_uid': 302,
+ 'glance_gid': 302
},
}, merge=pillar.glance.get('server', {})) %}
@@ -27,4 +31,4 @@
'RedHat': {
'pkgs': ['python-glanceclient']
},
-}, merge=pillar.glance.get('client', {})) %}
\ No newline at end of file
+}, merge=pillar.glance.get('client', {})) %}
diff --git a/glance/server.sls b/glance/server.sls
index 539eda0..20f23d9 100644
--- a/glance/server.sls
+++ b/glance/server.sls
@@ -10,8 +10,9 @@
user.present:
- name: glance
- home: /var/lib/glance
- - uid: 302
- - gid: 302
+ {# note: glance uid/gid values would not be evaluated after user is created. #}
+ - uid: {{ server.get('glance_uid') }}
+ - gid: {{ server.get('glance_gid') }}
- shell: /bin/false
- system: True
- require_in:
@@ -20,7 +21,8 @@
glance_group:
group.present:
- name: glance
- - gid: 302
+ {# note: glance uid/gid values would not be evaluated after user is created. #}
+ - gid: {{ server.get('glance_gid') }}
- system: True
- require_in:
- pkg: glance_packages