stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Adds Support for Registry Host"

Browse Source
This commit is contained in:
Jenkins
2013-07-16 23:40:09 +00:00
committed by Gerrit Code Review
parent 019e13ddde 6d8e13dd0f
commit ccf17d41dd
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/glance.pp
View File

@@ -15,6 +15,7 @@
# [db_host] Host where DB resides. Required. # [db_host] Host where DB resides. Required.
# [keystone_host] Host whre keystone is running. Optional. Defaults to '127.0.0.1' # [keystone_host] Host whre keystone is running. Optional. Defaults to '127.0.0.1'
# [sql_idle_timeout] Timeout for SQL to reap connections. Optional. Defaults to '3600' # [sql_idle_timeout] Timeout for SQL to reap connections. Optional. Defaults to '3600'
# [registry_host] Address used by API to find the Registry service. Optional. Defaults to '0.0.0.0'
# [db_type] Type of sql databse to use. Optional. Defaults to 'mysql' # [db_type] Type of sql databse to use. Optional. Defaults to 'mysql'
# [db_user] Name of glance DB user. Optional. Defaults to 'glance' # [db_user] Name of glance DB user. Optional. Defaults to 'glance'
# [db_name] Name of glance DB. Optional. Defaults to 'glance' # [db_name] Name of glance DB. Optional. Defaults to 'glance'
@@ -41,6 +42,7 @@ class openstack::glance (
$db_host = '127.0.0.1', $db_host = '127.0.0.1',
$keystone_host = '127.0.0.1', $keystone_host = '127.0.0.1',
$sql_idle_timeout = '3600', $sql_idle_timeout = '3600',
$registry_host = '0.0.0.0',
$db_type = 'mysql', $db_type = 'mysql',
$db_user = 'glance', $db_user = 'glance',
$db_name = 'glance', $db_name = 'glance',
@@ -64,6 +66,7 @@ class openstack::glance (
class { 'glance::api': class { 'glance::api':
verbose => $verbose, verbose => $verbose,
debug => $debug, debug => $debug,
registry_host => $registry_host,
auth_type => 'keystone', auth_type => 'keystone',
auth_port => '35357', auth_port => '35357',
auth_host => $keystone_host, auth_host => $keystone_host,

1
spec/classes/openstack_glance_spec.rb
View File

@@ -22,6 +22,7 @@ describe 'openstack::glance' do
should contain_class('glance::api').with( should contain_class('glance::api').with(
:verbose => false, :verbose => false,
:debug => false, :debug => false,
:registry_host => '0.0.0.0',
:auth_type => 'keystone', :auth_type => 'keystone',
:auth_port => '35357', :auth_port => '35357',
:auth_host => '127.0.1.1', :auth_host => '127.0.1.1',