diff --git a/cinder/volume.sls b/cinder/volume.sls
index 4df74c7..8fee662 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -20,8 +20,6 @@
   - require_in:
     - service: cinder_volume_services
 
-{%- if not pillar.cinder.get('controller', {}).get('enabled', False) %}
-
 {%- if volume.message_queue.get('ssl',{}).get('enabled', False) %}
 rabbitmq_ca_cinder_volume:
 {%- if volume.message_queue.ssl.cacert is defined %}
@@ -50,6 +48,8 @@
 {%- endif %}
 {%- endif %}
 
+{%- if not pillar.cinder.get('controller', {}).get('enabled', False) %}
+
 /etc/cinder/cinder.conf:
   file.managed:
   - source: salt://cinder/files/{{ volume.version }}/cinder.conf.volume.{{ grains.os_family }}