Add nova_cacert switch
Sets a default value for controller/compute.cacert_file
Related-Prod: PROD-22766
Change-Id: Ibb4b335e7be10dbf8fe2e7a5d2bb4fdabcc33cf6
diff --git a/nova/_ssl/rabbitmq.sls b/nova/_ssl/rabbitmq.sls
index fe08a3b..8e236e6 100644
--- a/nova/_ssl/rabbitmq.sls
+++ b/nova/_ssl/rabbitmq.sls
@@ -2,9 +2,11 @@
{%- if controller.enabled == True %}
{%- set nova_msg = controller.message_queue %}
+ {%- set nova_cacert = controller.cacert_file %}
{%- set role = 'controller' %}
{%- else %}
{%- set nova_msg = compute.message_queue %}
+ {%- set nova_cacert = compute.cacert_file %}
{%- set role = 'compute' %}
{%- endif %}
@@ -79,7 +81,7 @@
- makedirs: true
{%- else %}
file.exists:
- - name: {{ nova_msg.ssl.get('cacert_file', controller.cacert_file) }}
+ - name: {{ nova_msg.ssl.get('cacert_file', nova_cacert) }}
{%- endif %}
{%- endif %}
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 9c8589a..75fc533 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -8055,7 +8055,6 @@
{%- else %}
kombu_ssl_ca_certs = {{ compute.message_queue.ssl.get('cacert_file', compute.cacert_file) }}
{%- endif %}
-
{%- endif %}