stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #137 from enovance/bug/136/emilien

Browse Source 
Add new param to support both Glance ports
This commit is contained in:
Emilien Macchi 2014-02-03 00:52:43 -08:00
commit c73245562e
5 changed files with 28 additions and 28 deletions
Show Stats 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_hosts = $os_params::rabbit_hosts,
$rabbit_password = $os_params::rabbit_password, $rabbit_password = $os_params::rabbit_password,
$ks_glance_internal_host = $os_params::ks_glance_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 $glance_api_port = $os_params::ks_glance_api_internal_port,
# here in the future
$glance_api_port = $os_params::ks_glance_internal_port,
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
$debug = $os_params::debug $debug = $os_params::debug
) { ) {

4
manifests/identity.pp
View File

@ -343,9 +343,7 @@ class cloud::identity (
$ks_glance_password = $os_params::ks_glance_password, $ks_glance_password = $os_params::ks_glance_password,
$ks_glance_public_host = $os_params::ks_glance_public_host, $ks_glance_public_host = $os_params::ks_glance_public_host,
$ks_glance_public_proto = $os_params::ks_glance_public_proto, $ks_glance_public_proto = $os_params::ks_glance_public_proto,
# TODO(Gonéri) will have to use os_params::ks_glance_api_public_port $ks_glance_api_public_port = $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_admin_host = $os_params::ks_heat_admin_host,
$ks_heat_internal_host = $os_params::ks_heat_internal_host, $ks_heat_internal_host = $os_params::ks_heat_internal_host,
$ks_heat_password = $os_params::ks_heat_password, $ks_heat_password = $os_params::ks_heat_password,

10
manifests/image.pp
View File

@ -66,11 +66,8 @@ class cloud::image(
$glance_db_password = $os_params::glance_db_password, $glance_db_password = $os_params::glance_db_password,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_glance_internal_host = $os_params::ks_glance_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 $ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port,
# here in the future $ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port,
$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, $ks_glance_password = $os_params::ks_glance_password,
$rabbit_password = $os_params::rabbit_password, $rabbit_password = $os_params::rabbit_password,
$rabbit_host = $os_params::rabbit_hosts[0], $rabbit_host = $os_params::rabbit_hosts[0],
@ -88,6 +85,7 @@ class cloud::image(
class { 'glance::api': class { 'glance::api':
sql_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance", sql_connection => "mysql://${encoded_glance_user}:${encoded_glance_password}@${glance_db_host}/glance",
registry_host => $openstack_vip, registry_host => $openstack_vip,
registry_port => $ks_glance_registry_internal_port,
verbose => $verbose, verbose => $verbose,
debug => $debug, debug => $debug,
auth_host => $ks_keystone_internal_host, auth_host => $ks_keystone_internal_host,
@ -96,6 +94,7 @@ class cloud::image(
keystone_user => 'glance', keystone_user => 'glance',
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
bind_host => $api_eth, bind_host => $api_eth,
bind_port => $ks_glance_api_internal_port,
use_syslog => true use_syslog => true
} }
@ -109,6 +108,7 @@ class cloud::image(
keystone_user => 'glance', keystone_user => 'glance',
log_facility => 'LOG_LOCAL0', log_facility => 'LOG_LOCAL0',
bind_host => $api_eth, bind_host => $api_eth,
bind_port => $ks_glance_registry_internal_port,
use_syslog => true use_syslog => true
} }

5
manifests/loadbalancer.pp
View File

@ -43,9 +43,8 @@ class cloud::loadbalancer(
$ks_ec2_public_port = $os_params::ks_ec2_public_port, $ks_ec2_public_port = $os_params::ks_ec2_public_port,
# TODO(Gonéri): will have to use 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 # here in the future
$ks_glance_api_public_port = $os_params::ks_glance_public_port, $ks_glance_api_public_port = $os_params::ks_glance_api_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_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_public_port = $os_params::ks_heat_public_port,
$ks_heat_cfn_public_port = $os_params::ks_heat_cfn_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, $ks_heat_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port,

33
spec/classes/cloud_image_spec.rb
View File

@ -23,20 +23,22 @@ describe 'cloud::image' do
shared_examples_for 'openstack image' do shared_examples_for 'openstack image' do
let :params do let :params do
{ :glance_db_host => '10.0.0.1', { :glance_db_host => '10.0.0.1',
:glance_db_user => 'glance', :glance_db_user => 'glance',
:glance_db_password => 'secrete', :glance_db_password => 'secrete',
:ks_keystone_internal_host => '10.0.0.1', :ks_keystone_internal_host => '10.0.0.1',
:openstack_vip => '10.0.0.42', :ks_glance_internal_host => '10.0.0.1',
:ks_glance_api_internal_port => '9292', :openstack_vip => '10.0.0.42',
:ks_glance_password => 'secrete', :ks_glance_api_internal_port => '9292',
:rabbit_host => '10.0.0.1', :ks_glance_registry_internal_port => '9191',
:rabbit_password => 'secrete', :ks_glance_password => 'secrete',
:rbd_store_user => 'glance', :rabbit_host => '10.0.0.1',
:rbd_store_pool => 'images', :rabbit_password => 'secrete',
:debug => true, :rbd_store_user => 'glance',
:verbose => true, :rbd_store_pool => 'images',
:api_eth => '10.0.0.1' } :debug => true,
:verbose => true,
:api_eth => '10.0.0.1' }
end end
it 'configure glance-api' do it 'configure glance-api' do
@ -44,6 +46,7 @@ describe 'cloud::image' do
:sql_connection => 'mysql://glance:secrete@10.0.0.1/glance', :sql_connection => 'mysql://glance:secrete@10.0.0.1/glance',
:keystone_password => 'secrete', :keystone_password => 'secrete',
:registry_host => '10.0.0.42', :registry_host => '10.0.0.42',
:registry_port => '9191',
:keystone_tenant => 'services', :keystone_tenant => 'services',
:keystone_user => 'glance', :keystone_user => 'glance',
:verbose => true, :verbose => true,
@ -51,6 +54,7 @@ describe 'cloud::image' do
:auth_host => '10.0.0.1', :auth_host => '10.0.0.1',
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:bind_port => '9292',
:use_syslog => true :use_syslog => true
) )
end end
@ -66,6 +70,7 @@ describe 'cloud::image' do
:auth_host => '10.0.0.1', :auth_host => '10.0.0.1',
:log_facility => 'LOG_LOCAL0', :log_facility => 'LOG_LOCAL0',
:bind_host => '10.0.0.1', :bind_host => '10.0.0.1',
:bind_port => '9191',
:use_syslog => true :use_syslog => true
) )
end end