From 90398b6a9958c0f0b4f814565bf8fc4f330ffb24 Mon Sep 17 00:00:00 2001 From: sdodsley Date: Thu, 29 Oct 2015 11:16:42 -0400 Subject: [PATCH] Update with Glance Image Cache parameters WIP - needs to have tenant and user IDs added Fix typo Change-Id: Id1261b4dcdee1b0ca8b3db1ac384c1db82f5851c --- .../manifests/controller.pp | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp index d564462..082c4af 100755 --- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp +++ b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp @@ -27,10 +27,6 @@ class plugin_purestorage_cinder::controller ( provider => pip } - cinder_config { - "DEFAULT/host": value => "str:pure"; - } - $plugin_settings = hiera('fuel-plugin-purestorage-cinder') if $::cinder::params::volume_package { @@ -56,6 +52,22 @@ class plugin_purestorage_cinder::controller ( use_chap_auth => $plugin_settings['pure_chap'], use_multipath_for_image_xfer => $plugin_settings['pure_multipath'], pure_storage_protocol => $plugin_settings['pure_protocol'], + extra_options => { "$section/host" => { value => $section }, + "$section/image_volume_cache_enabled" => { value => $plugin_settings["pure_glance_image_cache"] } + } + + if $plugin_settings['image_volume_cache_enabled'] { + cinder::backend::pure { $section : + extra_options => { "$section/image_volume_cache_max_count" => { value => $plugin_settings["pure_glance_cache_count"] }, + "$section/image_volume_cache_max_size_gb" => { value => $plugin_settings["pure_glance_cache_size"] } +# SD - insert cinder internal tenant KVP pairs here for DEFAULT stanza +# Create the project and user here: use keystone_tenant(ensure=>present) and keystone_user(ensure=>present) but how do I get back the IDs. Also do I need to do keystone_role ? +# Parameters to set will be: +# cinder_internal_tenant_project_id = PROJECT_ID +# cinder_internal_tenant_user_id = USER_ID + + } + } } Cinder_config<||> ~> Service['cinder_volume']