[tls] Make a cert SLS IDs globally unique
At the moment most of openstack formulas have
the same ids of certs at state files, e.g.:
nova/server.sls - rabbitmq_ca : file_managed
glance/server.sls - rabbitmq_ca : file_managed
So, any attempt to use the:
salt-call state.apply
fails with:
Detected conflicting IDs, SLS IDs need to be
globally unique.
Change-Id: Iedb006ecab067638118b392bd2945ea139236a72
diff --git a/keystone/server.sls b/keystone/server.sls
index 9996eb3..3608855 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -228,7 +228,7 @@
{%- endif %}
- watch:
{%- if server.notification and server.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca
+ - file: rabbitmq_ca_keystone_server
{%- endif %}
- file: /etc/keystone/keystone.conf
{%- endif %}
@@ -438,7 +438,7 @@
{%- endif %} {# end noservices #}
{%- if server.database.get('ssl',{}).get('enabled',False) %}
-mysql_ca:
+mysql_ca_keystone_server:
{%- if server.database.ssl.cacert is defined %}
file.managed:
- name: {{ server.database.ssl.cacert_file }}
@@ -457,7 +457,7 @@
{%- if server.notification and server.message_queue.get('ssl',{}).get('enabled', False) %}
-rabbitmq_ca:
+rabbitmq_ca_keystone_server:
{%- if server.message_queue.ssl.cacert is defined %}
file.managed:
- name: {{ server.message_queue.ssl.cacert_file }}