stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Ensure port binding is correct for both API & registry

Browse Source 
- use bind_port for both services (Glance API & Registry)
- Ensure we use the right port for registry connection from API service
- unit tests

Close #136

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

3
manifests/image.pp
View File

@ -85,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,
@ -93,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
} }
@ -106,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
} }

4
spec/classes/cloud_image_spec.rb
View File

@ -30,6 +30,7 @@ describe 'cloud::image' do
:ks_glance_internal_host => '10.0.0.1', :ks_glance_internal_host => '10.0.0.1',
:openstack_vip => '10.0.0.42', :openstack_vip => '10.0.0.42',
:ks_glance_api_internal_port => '9292', :ks_glance_api_internal_port => '9292',
:ks_glance_registry_internal_port => '9191',
:ks_glance_password => 'secrete', :ks_glance_password => 'secrete',
:rabbit_host => '10.0.0.1', :rabbit_host => '10.0.0.1',
:rabbit_password => 'secrete', :rabbit_password => 'secrete',
@ -45,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,
@ -52,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
@ -67,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