Merge "Unhardcode service user/group uid/gid values Warn to not change nova uid/gid values after user is created"
diff --git a/nova/compute.sls b/nova/compute.sls
index 226df97..f2e9f18 100644
--- a/nova/compute.sls
+++ b/nova/compute.sls
@@ -133,8 +133,9 @@
{%- else %}
- shell: /bin/false
{%- endif %}
- - uid: 303
- - gid: 303
+ {# note: nova uid/gid values would not be evaluated after user is created. #}
+ - uid: {{ compute.get('nova_uid', 303) }}
+ - gid: {{ compute.get('nova_gid', 303) }}
- system: True
- groups:
{%- if salt['group.info']('libvirtd') %}
@@ -150,7 +151,8 @@
group_nova_compute:
group.present:
- name: nova
- - gid: 303
+ {# note: nova gid value would not be evaluated after user is created. #}
+ - gid: {{ compute.get('nova_gid', 303) }}
- system: True
- require_in:
- user: user_nova_compute
diff --git a/nova/controller.sls b/nova/controller.sls
index 85a3ee7..73cc55d 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -30,8 +30,9 @@
- name: nova
- home: /var/lib/nova
- shell: /bin/false
- - uid: 303
- - gid: 303
+ {# note: nova uid/gid values would not be evaluated after user is created. #}
+ - uid: {{ controller.get('nova_uid', 303) }}
+ - gid: {{ controller.get('nova_gid', 303) }}
- system: True
- require_in:
- pkg: nova_controller_packages
@@ -39,7 +40,8 @@
group_nova:
group.present:
- name: nova
- - gid: 303
+ {# note: nova gid value would not be evaluated after user is created. #}
+ - gid: {{ controller.get('nova_gid', 303) }}
- system: True
- require_in:
- user: user_nova