stackforge/puppet-openstack-cloud
Code Issues Proposed changes

parcial reverse of f8c2438fdee372c5286aa3778c1

Browse Source 
As discussed with @leseb, this commit about the introduction of new
$os_params:: keys. We believe it's better to introduce them during
the next stable release as:
- they are not mandatory
- they will create breakage if introduced without manifests/params.pp
  changes
This commit is contained in:
Gonéri Le Bouder 2014-01-31 13:33:04 +01:00 committed by Sébastien Han
parent 4e5d5fb9a4
commit da967652f1
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/compute.pp
View File

@ -63,7 +63,9 @@ 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,
$glance_api_port = $os_params::ks_glance_api_internal_port,
#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,
$verbose = $os_params::verbose,
$debug = $os_params::debug
) {

4
manifests/identity.pp
View File

@ -343,7 +343,9 @@ class cloud::identity (
$ks_glance_password = $os_params::ks_glance_password,
$ks_glance_public_host = $os_params::ks_glance_public_host,
$ks_glance_public_proto = $os_params::ks_glance_public_proto,
$ks_glance_api_public_port = $os_params::ks_glance_api_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,
$ks_heat_admin_host = $os_params::ks_heat_admin_host,
$ks_heat_internal_host = $os_params::ks_heat_internal_host,
$ks_heat_password = $os_params::ks_heat_password,

7
manifests/image.pp
View File

@ -66,8 +66,11 @@ 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,
$ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port,
$ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port,
# 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_password = $os_params::ks_glance_password,
$rabbit_password = $os_params::rabbit_password,
$rabbit_host = $os_params::rabbit_hosts[0],

7
manifests/loadbalancer.pp
View File

@ -41,8 +41,11 @@ class cloud::loadbalancer(
$ks_cinder_public_port = $os_params::ks_cinder_public_port,
$ks_ceilometer_public_port = $os_params::ks_ceilometer_public_port,
$ks_ec2_public_port = $os_params::ks_ec2_public_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,
# 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_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,