x
/
fuel-plugin-purestorage-cinder
Code Issues Proposed changes

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
This commit is contained in:
Simon Dodsley 2016-06-24 14:13:56 -04:00
parent dd4f169c59
commit 97d19b64ca
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment_scripts/puppet/modules/plugin_purestorage_cinder/manifests/controller.pp
View File

@ -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;

11
deployment_tasks.yaml
View File

@ -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

2
environment_config.yaml
View File

@ -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: