Fix for 'image_conversion_dir' when cinder controller and volume on same node.
Change-Id: Ieac4d41229675ba059308f816c232f05b077604e
Related-Prod: PROD-29437
diff --git a/cinder/volume.sls b/cinder/volume.sls
index 433171a..f1d5b93 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -28,19 +28,6 @@
- require_in:
- service: cinder_volume_services
-{%- if volume.image_conversion_dir is defined %}
-{{ volume.image_conversion_dir }}:
- file.directory:
- - mode: 755
- - user: cinder
- - group: cinder
- - makedirs: true
- - require:
- - pkg: cinder_volume_packages
- - require_in:
- - service: cinder_volume_services
-{%- endif %}
-
{%- if volume.message_queue.get('ssl',{}).get('enabled', False) %}
rabbitmq_ca_cinder_volume:
{%- if volume.message_queue.ssl.cacert is defined %}
@@ -59,6 +46,19 @@
{%- if not pillar.cinder.get('controller', {}).get('enabled', False) %}
+{%- if volume.image_conversion_dir is defined %}
+{{ volume.image_conversion_dir }}:
+ file.directory:
+ - mode: 755
+ - user: cinder
+ - group: cinder
+ - makedirs: true
+ - require:
+ - pkg: cinder_volume_packages
+ - require_in:
+ - service: cinder_volume_services
+{%- endif %}
+
/etc/cinder/cinder.conf:
file.managed:
- source: salt://cinder/files/{{ volume.version }}/cinder.conf.volume.{{ grains.os_family }}