Merge "[tls] Make a cert SLS IDs globally unique"
diff --git a/nova/compute.sls b/nova/compute.sls
index 61f6d4f..eb3127e 100644
--- a/nova/compute.sls
+++ b/nova/compute.sls
@@ -75,9 +75,10 @@
- template: jinja
- require:
- pkg: nova_compute_packages
+{%- endif %}
{%- if compute.message_queue.get('ssl',{}).get('enabled',False) %}
-rabbitmq_ca:
+rabbitmq_ca_nova_compute:
{%- if compute.message_queue.ssl.cacert is defined %}
file.managed:
- name: {{ compute.message_queue.ssl.cacert_file }}
@@ -90,8 +91,6 @@
{%- endif %}
{%- endif %}
-{%- endif %}
-
nova_compute_services:
service.running:
- enable: true
@@ -99,7 +98,7 @@
- watch:
- file: /etc/nova/nova.conf
{%- if compute.message_queue.get('ssl',{}).get('enabled',False) %}
- - file: rabbitmq_ca
+ - file: rabbitmq_ca_nova_compute
{%- endif %}
{%- set ident = compute.identity %}
diff --git a/nova/controller.sls b/nova/controller.sls
index 2c90f0f..4bc8035 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -25,7 +25,7 @@
- names: {{ controller.pkgs }}
{%- if controller.message_queue.get('ssl',{}).get('enabled',False) %}
-rabbitmq_ca:
+rabbitmq_ca_nova_controller:
{%- if controller.message_queue.ssl.cacert is defined %}
file.managed:
- name: {{ controller.message_queue.ssl.cacert_file }}
@@ -283,7 +283,7 @@
- file: /etc/nova/api-paste.ini
- file: /etc/apache2/sites-available/nova-placement-api.conf
{%- if controller.database.get('ssl',{}).get('enabled',False) %}
- - file: mysql_ca
+ - file: mysql_ca_nova_controller
{% endif %}
{%- endif %}
@@ -301,10 +301,10 @@
- file: /etc/nova/nova.conf
- file: /etc/nova/api-paste.ini
{%- if controller.message_queue.get('ssl',{}).get('enabled',False) %}
- - file: rabbitmq_ca
+ - file: rabbitmq_ca_nova_controller
{%- endif %}
{%- if controller.database.get('ssl',{}).get('enabled',False) %}
- - file: mysql_ca
+ - file: mysql_ca_nova_controller
{% endif %}
{%- if grains.get('virtual_subtype', None) == "Docker" %}
@@ -319,7 +319,7 @@
{%- endif %}
{%- if controller.database.get('ssl',{}).get('enabled',False) %}
-mysql_ca:
+mysql_ca_nova_controller:
{%- if controller.database.ssl.cacert is defined %}
file.managed:
- name: {{ controller.database.ssl.cacert_file }}