Fix unless statement for keystone_identity_bootstrap_setup
cmd was launched under user keysone, while unless statement tried to access
to /root/keystonercv3 and failed.
This patch creates rc file for keystone user in /var/lib/keystone directory
Change-Id: Id7159e3fd9487bca97129bab55fe691963625598
Related-Prod: PROD-29692
diff --git a/keystone/server.sls b/keystone/server.sls
index 2b300be..886b5e8 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -314,6 +314,16 @@
- require:
- pkg: keystone_packages
+/var/lib/keystone/keystonercv3:
+ file.managed:
+ - source: salt://keystone/files/keystonercv3
+ - template: jinja
+ - mode: 0640
+ - user: keystone
+ - group: keystone
+ - require:
+ - pkg: keystone_packages
+
{% if server.tokens.engine == 'fernet' %}
keystone_fernet_keys:
@@ -414,10 +424,12 @@
--bootstrap-internal-url {{ server.bind.get('protocol', 'http') }}://{{ server.bind.address }}:{{ server.bind.get('port', 5000) }}
- runas: 'keystone'
- unless:
- . /root/keystonercv3; openstack endpoint list --service identity --interface internal -f value -c URL |grep {{ server.bind.get('port', 5000) }}
+ . /var/lib/keystone/keystonercv3; openstack endpoint list --service identity --interface internal -f value -c URL |grep {{ server.bind.get('port', 5000) }}
{%- if server.get('role', 'secondary') != 'primary' or grains.get('noservices', False) %}
- onlyif: /bin/false
{%- endif %}
+ - require:
+ - file: /var/lib/keystone/keystonercv3
{%- endif %}
{%- if not grains.get('noservices', False) %}