Fix ssl file names for api+conductor combined case
This patch fixes issue around ssl file names when
api and conductor are enabled on the same host.
Change-Id: Ifb42b70e534751761f61336e6749a02c544c927c
Related-Prod: PROD-17073
diff --git a/ironic/_common.sls b/ironic/_common.sls
index 5d8e2bf..a60f0a6 100644
--- a/ironic/_common.sls
+++ b/ironic/_common.sls
@@ -18,7 +18,7 @@
- pkg: ironic_common_pkgs
{%- if ironic.message_queue.get('ssl',{}).get('enabled', False) %}
-rabbitmq_ca_ironic_{{ service_name }}:
+rabbitmq_ca_ironic_file:
{%- if ironic.message_queue.ssl.cacert is defined %}
file.managed:
- name: {{ ironic.message_queue.ssl.cacert_file }}
@@ -32,7 +32,7 @@
{%- endif %}
{%- if ironic.database.get('ssl',{}).get('enabled', False) %}
-mysql_ca_ironic_{{ service_name }}:
+mysql_ca_ironic_file:
{%- if ironic.database.ssl.cacert is defined %}
file.managed:
- name: {{ ironic.databse.ssl.cacert_file }}
diff --git a/ironic/api.sls b/ironic/api.sls
index 705f594..8433c7d 100644
--- a/ironic/api.sls
+++ b/ironic/api.sls
@@ -23,10 +23,10 @@
- file: /etc/ironic/ironic.conf
- file: /etc/ironic/policy.json
{%- if api.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca_ironic_api
+ - file: rabbitmq_ca_ironic_file
{%- endif %}
{%- if api.database.get('ssl',{}).get('enabled', False) %}
- - file: mysql_ca_ironic_api
+ - file: mysql_ca_ironic_file
{%- endif %}
/etc/ironic/policy.json:
diff --git a/ironic/conductor.sls b/ironic/conductor.sls
index 3241340..8ea16bc 100644
--- a/ironic/conductor.sls
+++ b/ironic/conductor.sls
@@ -15,10 +15,10 @@
- watch:
- file: /etc/ironic/ironic.conf
{%- if conductor.message_queue.get('ssl',{}).get('enabled', False) %}
- - file: rabbitmq_ca_ironic_conductor
+ - file: rabbitmq_ca_ironic_file
{%- endif %}
{%- if conductor.database.get('ssl',{}).get('enabled', False) %}
- - file: mysql_ca_ironic_conductor
+ - file: mysql_ca_ironic_file
{%- endif %}
ironic_dirs: