Merge pull request #26 from stelucz/caching
Image-Volume cache
diff --git a/cinder/controller.sls b/cinder/controller.sls
index 2e2f891..eefae34 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -95,6 +95,8 @@
_data: {{ controller.logging }}
- require:
- pkg: cinder_controller_packages
+ - require_in:
+ - sls: cinder.db.offline_sync
{%- if controller.logging.log_handlers.get('fluentd', {}).get('enabled', False) %}
- pkg: cinder_controller_fluentd_logger_package
{%- endif %}
diff --git a/cinder/files/backend/_gpfs.conf b/cinder/files/backend/_gpfs.conf
index 09289b2..3c2fcef 100644
--- a/cinder/files/backend/_gpfs.conf
+++ b/cinder/files/backend/_gpfs.conf
@@ -4,7 +4,8 @@
volume_backend_name={{ backend_name }}
volume_driver = cinder.volume.drivers.ibm.gpfs.GPFSDriver
gpfs_mount_point_base={{ backend.mount_point }}
-#gpfs_mount_point_base=/mnt/gpfs-openstack/cinder/gold
+gpfs_images_dir={{ backend.gpfs_images_dir }}
+gpfs_images_share_mode={{ backend.gpfs_images_share_mode }}
gpfs_max_clone_depth=3
gpfs_sparse_volumes=true
-gpfs_storage_pool=system
\ No newline at end of file
+gpfs_storage_pool=system
diff --git a/tests/pillar/gpfs_single.sls b/tests/pillar/gpfs_single.sls
index 4491ac6..4fffd3c 100644
--- a/tests/pillar/gpfs_single.sls
+++ b/tests/pillar/gpfs_single.sls
@@ -56,10 +56,14 @@
type_name: GPFS-GOLD
engine: gpfs
mount_point: '/mnt/gpfs-openstack/cinder/gold'
+ gpfs_images_dir: '/mnt/gpfs-openstack/glance/images'
+ gpfs_images_share_mode: copy_on_write
GPFS-SILVER:
type_name: GPFS-SILVER
engine: gpfs
mount_point: '/mnt/gpfs-openstack/cinder/silver'
+ gpfs_images_dir: '/mnt/gpfs-openstack/glance/images'
+ gpfs_images_share_mode: copy_on_write
identity:
engine: keystone
host: 127.0.0.1