Add ability to set custom keystone user names
Add ability to set custom keystone user names in keystoneng
module if they are present in pillar.
Depends-On: https://gerrit.mcp.mirantis.com/#/c/44319/
Depends-On: https://gerrit.mcp.mirantis.com/#/c/44320/
Depends-On: https://gerrit.mcp.mirantis.com/#/c/45119/
Change-Id: I4c528a231529d7466afa5d7c80f3135ecaa00239
Related-Prod: PROD-31315
(cherry picked from commit 196016fcaeb572108221933051b67568a52e80b7)
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 }}
diff --git a/keystone/client/server.sls b/keystone/client/server.sls
index bf83eeb..13cff88 100644
--- a/keystone/client/server.sls
+++ b/keystone/client/server.sls
@@ -143,7 +143,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 }}
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 }}