stackforge/puppet-openstack
Code Issues Proposed changes

Allow passing keystone_host to controller class

Browse Source 
The different components defaults to 127.0.0.1 for keystone
for the controller class. This fix allows to override that for
situations where the keystone service is not deployed on the
controller.

Change-Id: I982de99d6b96f09dc086f46f8db6acb830211cd6
This commit is contained in:
Matthew Black
2013-09-23 10:47:28 -04:00
parent 254edb533a
commit d58142ea44
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/controller.pp
View File

@@ -443,6 +443,8 @@ class openstack::controller (
rabbit_virtual_host => $rabbit_virtual_host,
# Glance
glance_api_servers => $glance_api_servers,
# Keystone
keystone_host => $keystone_host,
# VNC
vnc_enabled => $vnc_enabled,
vncproxy_host => $vncproxy_host_real,
@@ -560,6 +562,7 @@ class openstack::controller (
cache_server_ip => $cache_server_ip,
cache_server_port => $cache_server_port,
horizon_app_links => $horizon_app_links,
keystone_host => $keystone_host,
}
}

5
spec/classes/openstack_controller_spec.rb
View File

@@ -17,6 +17,7 @@ describe 'openstack::controller' do
:keystone_db_password => 'keystone_pass',
:keystone_admin_token => 'keystone_admin_token',
:keystone_token_driver => 'keystone.token.backends.kvs.Token',
:keystone_host => '127.0.0.1',
:glance_registry_host => '0.0.0.0',
:glance_db_password => 'glance_pass',
:glance_user_password => 'glance_pass',
@@ -473,6 +474,7 @@ describe 'openstack::controller' do
:admin_user => 'nova',
:admin_password => 'nova_pass',
:enabled_apis => 'ec2,osapi_compute,metadata',
:auth_host => '127.0.0.1',
:api_bind_address => '0.0.0.0'
)
should contain_class('nova::cert').with(:enabled => true)
@@ -528,7 +530,8 @@ describe 'openstack::controller' do
:secret_key => 'secret_key',
:cache_server_ip => '127.0.0.1',
:cache_server_port => '11211',
:horizon_app_links => false
:horizon_app_links => false,
:keystone_host => '127.0.0.1'
)
end