Merge "Update neuron config file permissions"
diff --git a/neutron/_ssl/rabbitmq.sls b/neutron/_ssl/rabbitmq.sls
index f7a8727..401b3de 100644
--- a/neutron/_ssl/rabbitmq.sls
+++ b/neutron/_ssl/rabbitmq.sls
@@ -18,6 +18,7 @@
   test.show_notification:
     - text: "Running neutron._ssl.rabbitmq"
 
+{%- if neutron_msg is mapping %}
 {%- if neutron_msg.get('x509',{}).get('enabled',False) %}
 
   {%- set ca_file=neutron_msg.x509.ca_file %}
@@ -75,7 +76,7 @@
     - user: neutron
     - group: neutron
 
-  {% elif neutron_msg.get('ssl',{}).get('enabled',False) %}
+{% elif neutron_msg.get('ssl',{}).get('enabled',False) %}
 rabbitmq_ca_neutron_client:
   {%- if neutron_msg.ssl.cacert is defined %}
   file.managed:
@@ -89,3 +90,4 @@
   {%- endif %}
 
 {%- endif %}
+{%- endif %}