From 97d19b64ca3c360dd6c29771bba825b98d0e9e24 Mon Sep 17 00:00:00 2001 From: Simon Dodsley Date: Fri, 24 Jun 2016 14:13:56 -0400 Subject: [PATCH] Make glance image cache IDs idempotent There is no easy way to get a keystone user or tenant ID through puppet, so in the interim we will use a random string for each of these. hey are arbitrary values anyway and don't need to link to a true user or tenant. Change-Id: I005436ba206753a0ab7a627fb10d66d194eba1f1 --- .../plugin_purestorage_cinder/manifests/controller.pp | 6 ++++-- deployment_tasks.yaml | 11 ++++++++++- environment_config.yaml | 2 +- 3 files changed, 15 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 aefc6b2..e1393b8 100755 --- a/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp +++ b/deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp @@ -102,8 +102,10 @@ class plugin_purestorage_cinder::controller ( } cinder_config { - "DEFAULT/cinder_internal_tenant_project_id": value => $::cinder_tenant; - "DEFAULT/cinder_internal_tenant_user_id": value => $::cinder_user; +# "DEFAULT/cinder_internal_tenant_project_id": value => $::cinder_tenant; +# "DEFAULT/cinder_internal_tenant_user_id": value => $::cinder_user; + "DEFAULT/cinder_internal_tenant_project_id": value => "123456789abcdef123456789abcdef12"; + "DEFAULT/cinder_internal_tenant_user_id": value => "123456789abcdef123456789abcdef13"; "$section/image_volume_cache_enabled": value => $glance_image_cache; "$section/image_volume_cache_max_count": value => $glance_image_count; "$section/image_volume_cache_max_size_gb": value => $glance_image_size; diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 5fccce2..34aa964 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -1,8 +1,17 @@ # Deployment tasks +- id: configure_internal_tenant + role: ['primary-controller', 'controller'] + required_for: [configure_purestorage_controller] + requires: [post_deployment_start] + type: puppet + parameters: + puppet_manifest: puppet/manifests/tenant.pp + puppet_modules: "puppet/modules/:/etc/puppet/modules/" + timeout: 360 - id: configure_purestorage_controller role: ['primary-controller', 'controller'] required_for: [post_deployment_end] - requires: [post_deployment_start] + requires: [configure_internal_tenant] type: puppet parameters: puppet_manifest: puppet/manifests/controller.pp diff --git a/environment_config.yaml b/environment_config.yaml index 699e2dc..a2854c1 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -205,7 +205,7 @@ attributes: pure_glance_cache_size: value: '0' label: 'Glance Image Cache Size (image_volume_cache_max_size_gb)' - description: 'Maximum size for Glance Image Cache [GB] 90 = no limit)' + description: 'Maximum size for Glance Image Cache [GB] (0 = no limit)' weight: 37 type: "text" restrictions: