stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Exposes the Glance registry_host Parameter"

Browse Source
This commit is contained in:
Jenkins
2013-07-23 17:03:49 +00:00
committed by Gerrit Code Review
parent 120967cf1d 7f2b07007c
commit 1ce03042ac
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/controller.pp
View File

@@ -16,6 +16,8 @@
# [keystone_admin_token] Admin token for keystone. # [keystone_admin_token] Admin token for keystone.
# [keystone_bind_address] Address that keystone api service should bind to. # [keystone_bind_address] Address that keystone api service should bind to.
# Optional. Defaults to '0.0.0.0'. # Optional. Defaults to '0.0.0.0'.
# [glance_registry_host] Address used by Glance API to find the Glance Registry service.
# Optional. Defaults to '0.0.0.0'.
# [glance_db_password] Glance DB password. # [glance_db_password] Glance DB password.
# [glance_user_password] Glance service user password. # [glance_user_password] Glance service user password.
# [nova_db_password] Nova DB password. # [nova_db_password] Nova DB password.
@@ -162,6 +164,7 @@ class openstack::controller (
$keystone_bind_address = '0.0.0.0', $keystone_bind_address = '0.0.0.0',
$region = 'RegionOne', $region = 'RegionOne',
# Glance # Glance
$glance_registry_host = '0.0.0.0',
$glance_db_user = 'glance', $glance_db_user = 'glance',
$glance_db_dbname = 'glance', $glance_db_dbname = 'glance',
$glance_api_servers = undef, $glance_api_servers = undef,
@@ -339,6 +342,7 @@ class openstack::controller (
db_host => $db_host, db_host => $db_host,
sql_idle_timeout => $sql_idle_timeout, sql_idle_timeout => $sql_idle_timeout,
keystone_host => $keystone_host, keystone_host => $keystone_host,
registry_host => $glance_registry_host,
db_user => $glance_db_user, db_user => $glance_db_user,
db_name => $glance_db_dbname, db_name => $glance_db_dbname,
db_password => $glance_db_password, db_password => $glance_db_password,

4
spec/classes/openstack_controller_spec.rb
View File

@@ -16,6 +16,7 @@ describe 'openstack::controller' do
:rabbit_virtual_host => '/', :rabbit_virtual_host => '/',
:keystone_db_password => 'keystone_pass', :keystone_db_password => 'keystone_pass',
:keystone_admin_token => 'keystone_admin_token', :keystone_admin_token => 'keystone_admin_token',
:glance_registry_host => '0.0.0.0',
:glance_db_password => 'glance_pass', :glance_db_password => 'glance_pass',
:glance_user_password => 'glance_pass', :glance_user_password => 'glance_pass',
:nova_bind_address => '0.0.0.0', :nova_bind_address => '0.0.0.0',
@@ -276,6 +277,7 @@ describe 'openstack::controller' do
:keystone_tenant => 'services', :keystone_tenant => 'services',
:keystone_user => 'glance', :keystone_user => 'glance',
:keystone_password => 'glance_pass', :keystone_password => 'glance_pass',
:registry_host => '0.0.0.0',
:sql_connection => 'mysql://glance:glance_pass@127.0.0.1/glance', :sql_connection => 'mysql://glance:glance_pass@127.0.0.1/glance',
:enabled => true :enabled => true
) )
@@ -318,6 +320,7 @@ describe 'openstack::controller' do
default_params.merge( default_params.merge(
:verbose => false, :verbose => false,
:debug => false, :debug => false,
:glance_registry_host => '127.0.0.2',
:glance_user_password => 'glance_pass2', :glance_user_password => 'glance_pass2',
:glance_db_password => 'glance_pass3', :glance_db_password => 'glance_pass3',
:db_host => '127.0.0.2', :db_host => '127.0.0.2',
@@ -332,6 +335,7 @@ describe 'openstack::controller' do
should contain_class('glance::api').with( should contain_class('glance::api').with(
:verbose => false, :verbose => false,
:debug => false, :debug => false,
:registry_host => '127.0.0.2',
:auth_type => 'keystone', :auth_type => 'keystone',
:auth_host => '127.0.0.1', :auth_host => '127.0.0.1',
:auth_port => '35357', :auth_port => '35357',