diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py index 3dd9daec4..adf4e0854 100644 --- a/packstack/plugins/keystone_100.py +++ b/packstack/plugins/keystone_100.py @@ -58,7 +58,7 @@ def initConfig(controller): "MASK_INPUT": False, "LOOSE_VALIDATION": False, "CONF_NAME": "CONFIG_KEYSTONE_REGION", - "USE_DEFAULT": True, + "USE_DEFAULT": False, "NEED_CONFIRM": False, "CONDITION": False}, diff --git a/packstack/puppet/templates/glance.pp b/packstack/puppet/templates/glance.pp index 9d7aaad62..e1090d161 100644 --- a/packstack/puppet/templates/glance.pp +++ b/packstack/puppet/templates/glance.pp @@ -10,6 +10,7 @@ class { 'glance::api': database_connection => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance", verbose => true, debug => hiera('CONFIG_DEBUG_MODE'), + os_region_name => hiera('CONFIG_KEYSTONE_REGION') } class { 'glance::registry': @@ -21,4 +22,3 @@ class { 'glance::registry': verbose => true, debug => hiera('CONFIG_DEBUG_MODE'), } - diff --git a/packstack/puppet/templates/provision_demo_glance.pp b/packstack/puppet/templates/provision_demo_glance.pp index 062d0a2af..e9f7fe583 100644 --- a/packstack/puppet/templates/provision_demo_glance.pp +++ b/packstack/puppet/templates/provision_demo_glance.pp @@ -12,4 +12,3 @@ disk_format => 'qcow2', source => $image_source, } -