commit af661e7ac16b9c2f23e97e57fe8fe066203ec846
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Oct 30 06:54:50 2018 +0000
committer Gerrit Code Review <mail@domain.com> Tue Oct 30 06:54:50 2018 +0000
tree 90d9469137f7725a07d26e134ca7930ffac6f72c
parent 999aff8c6fb2ca19db848148b254fb259bc22fda
parent 4be6e49698ed44fe95e981daf6339c3f9732a0b5

Merge "Tune default thresholds for the nstat_time_squeeze based alerts"

linux/system/user.sls

diff --git a/linux/system/user.sls b/linux/system/user.sls
index c63f91b..42086d5 100644
--- a/linux/system/user.sls
+++ b/linux/system/user.sls
@@ -37,7 +37,11 @@
   - password: {{ user.password }}
   - hash_password: {{ user.get('hash_password', False) }}
   {% endif %}
+  {%- if user.gid is defined and user.gid %}
+  - gid: {{ user.gid }}
+  {%- else %}
   - gid_from_name: true
+  {%- endif %}
   {%- if user.groups is defined %}
   - groups: {{ user.groups }}
   {%- endif %}