Merge "Add configuration option 'image_conversion_dir' for cinder."
diff --git a/cinder/control/cluster.yml b/cinder/control/cluster.yml
index 286f2ad..a81d257 100644
--- a/cinder/control/cluster.yml
+++ b/cinder/control/cluster.yml
@@ -27,6 +27,8 @@
backend: {}
version: ${_param:cinder_version}
role: ${_param:openstack_node_role}
+ # set 'image_conversion_dir' option in case of ceph deployment volume and controller running on the same node
+ image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
osapi:
host: ${_param:cluster_local_address}
database:
diff --git a/cinder/control/single.yml b/cinder/control/single.yml
index 2d662f9..31b391b 100644
--- a/cinder/control/single.yml
+++ b/cinder/control/single.yml
@@ -19,6 +19,8 @@
backend: {}
default_volume_type: ''
role: ${_param:openstack_node_role}
+ # set 'image_conversion_dir' option in case of ceph deployment volume and controller running on the same node
+ image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
database:
host: ${_param:single_address}
x509:
diff --git a/cinder/volume/local.yml b/cinder/volume/local.yml
index e42eef3..6478d6f 100644
--- a/cinder/volume/local.yml
+++ b/cinder/volume/local.yml
@@ -7,6 +7,7 @@
cinder:
volume:
enabled: True
+ image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
database:
host: ${_param:single_address}
x509:
diff --git a/cinder/volume/single.yml b/cinder/volume/single.yml
index a865722..74f2344 100644
--- a/cinder/volume/single.yml
+++ b/cinder/volume/single.yml
@@ -13,6 +13,7 @@
cinder:
volume:
enabled: True
+ image_conversion_dir: ${_param:cinder_image_conversion_dir_path}
database:
host: ${_param:openstack_database_address}
x509:
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 290a511..f7572f3 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -44,6 +44,7 @@
cinder_version: ${_param:openstack_version}
cinder_upgrade_enabled: ${_param:openstack_upgrade_enabled}
cinder_service_user_enabled: ${_param:openstack_service_user_enabled}
+ cinder_image_conversion_dir_path: /var/tmp/cinder/conversion
# Nova
nova_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
nova_memcache_secret_key: ''