stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Add new param to support both Glance ports

Browse Source 
Close #136

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-01 15:51:47 +01:00
parent 3c23a67111
commit 26b20003f3
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute.pp
View File

@@ -63,9 +63,7 @@ class cloud::compute(
$rabbit_hosts = $os_params::rabbit_hosts,
$rabbit_password = $os_params::rabbit_password,
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
#TODO(Gonéri) will have to use $os_params::ks_glance_api_internal_port
# here in the future
$glance_api_port = $os_params::ks_glance_internal_port,
$glance_api_port = $os_params::ks_glance_api_internal_port,
$verbose = $os_params::verbose,
$debug = $os_params::debug
) {

7
manifests/image.pp
View File

@@ -66,11 +66,8 @@ class cloud::image(
$glance_db_password = $os_params::glance_db_password,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
# TODO(Gonéri) will have to use $os_params::ks_glance_api_internal_port
# here in the future
$ks_glance_api_internal_port = $os_params::ks_glance_internal_port,
# TODO(Gonéri) will have to use $os_params::ks_glance_registry_internal_port
$ks_glance_registry_internal_port = $os_params::ks_glance_internal_port,
$ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port,
$ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port,
$ks_glance_password = $os_params::ks_glance_password,
$rabbit_password = $os_params::rabbit_password,
$rabbit_host = $os_params::rabbit_hosts[0],

5
manifests/loadbalancer.pp
View File

@@ -43,9 +43,8 @@ class cloud::loadbalancer(
$ks_ec2_public_port = $os_params::ks_ec2_public_port,
# TODO(Gonéri): will have to use os_params::ks_glance_api_public_port
# here in the future
$ks_glance_api_public_port = $os_params::ks_glance_public_port,
# TODO(Gonéri) will have to use $os_params::ks_glance_registry_internal_port
$ks_glance_registry_internal_port = $os_params::ks_glance_internal_port,
$ks_glance_api_public_port = $os_params::ks_glance_api_public_port,
$ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port,
$ks_heat_public_port = $os_params::ks_heat_public_port,
$ks_heat_cfn_public_port = $os_params::ks_heat_cfn_public_port,
$ks_heat_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port,