x/packstack
Code Issues Proposed changes

Merge "Fixed Cirros image provisioning" into juno

Browse Source
This commit is contained in:
Jenkins
2015-03-05 11:08:03 +00:00
committed by Gerrit Code Review
parent cb52cab6a2 9fcb12cb7e
commit 677c34b128
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/plugins/keystone_100.py
View File

@@ -58,7 +58,7 @@ def initConfig(controller):
"MASK_INPUT": False, "MASK_INPUT": False,
"LOOSE_VALIDATION": False, "LOOSE_VALIDATION": False,
"CONF_NAME": "CONFIG_KEYSTONE_REGION", "CONF_NAME": "CONFIG_KEYSTONE_REGION",
"USE_DEFAULT": True, "USE_DEFAULT": False,
"NEED_CONFIRM": False, "NEED_CONFIRM": False,
"CONDITION": False}, "CONDITION": False},

2
packstack/puppet/templates/glance.pp
View File

@@ -10,6 +10,7 @@ class { 'glance::api':
database_connection => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance", database_connection => "mysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
verbose => true, verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'), debug => hiera('CONFIG_DEBUG_MODE'),
os_region_name => hiera('CONFIG_KEYSTONE_REGION')
} }
class { 'glance::registry': class { 'glance::registry':
@@ -21,4 +22,3 @@ class { 'glance::registry':
verbose => true, verbose => true,
debug => hiera('CONFIG_DEBUG_MODE'), debug => hiera('CONFIG_DEBUG_MODE'),
} }

1
packstack/puppet/templates/provision_demo_glance.pp
View File

@@ -12,4 +12,3 @@
disk_format => 'qcow2', disk_format => 'qcow2',
source => $image_source, source => $image_source,
} }