commit 6408ca9649b79fea356f443518055db4061d6d6e
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Jul 05 12:39:30 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Jul 05 12:39:30 2019 +0000
tree ceafde7d0d8cf3e554ca45eb46ab1498afd7d45f
parent 5e1bce8f282f381f26603db3247e68fc01b302b9
parent 04ee6e32757105ada8d75eff36c2db15301452b9

Merge "Added opportunity remove service item." into release/2019.2.0

keystone/client/project.sls

diff --git a/keystone/client/project.sls b/keystone/client/project.sls
index c8179d9..6d87888 100644
--- a/keystone/client/project.sls
+++ b/keystone/client/project.sls
@@ -29,7 +29,7 @@
 
 keystone_{{ tenant_name }}_user_{{ user_name }}:
   keystoneng.user_present:
-  - name: {{ user_name }}
+  - name: {{ user.get('name', user_name) }}
   - password: {{ user.password }}
   - email: {{ user.get('email', 'root@localhost') }}
   - tenant: {{ tenant_name }}

keystone/client/server.sls

diff --git a/keystone/client/server.sls b/keystone/client/server.sls
index df856a4..87ef7eb 100644
--- a/keystone/client/server.sls
+++ b/keystone/client/server.sls
@@ -164,7 +164,7 @@
 
 keystone_{{ server_name }}_tenant_{{ tenant_name }}_user_{{ user_name }}:
   keystoneng.user_present:
-  - name: {{ user_name }}
+  - name: {{ user.get('name', user_name) }}
   - password: {{ user.password }}
   {%- if user.email is defined %}
   - email: {{ user.email }}

keystone/server.sls

diff --git a/keystone/server.sls b/keystone/server.sls
index 886b5e8..a0ab534 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -539,7 +539,7 @@
 
 keystone_user_{{ user_name }}:
   keystoneng.user_present:
-  - name: {{ user_name }}
+  - name: {{ user.get('name', user_name) }}
   - password: {{ user.password }}
   - email: {{ user.get('email', 'root@localhost') }}
   - tenant: {{ tenant_name }}