stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Expose debug parameter"

Browse Source
This commit is contained in:
Jenkins
2013-10-01 20:56:59 +00:00
committed by Gerrit Code Review
parent 4687c68131 23811d6122
commit 0911366345
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/all.pp
View File

@@ -30,6 +30,7 @@
# [fixed_range] Range of ipv4 network for vms. # [fixed_range] Range of ipv4 network for vms.
# [floating_range] Floating ip range to create. # [floating_range] Floating ip range to create.
# [create_networks] Rather network and floating ips should be created. # [create_networks] Rather network and floating ips should be created.
# [debug] (bool) Whether to log services at debug. Default to: false.
# [num_networks] Number of networks that fixed range should be split into. # [num_networks] Number of networks that fixed range should be split into.
# [multi_host] Rather node should support multi-host networking mode for HA. # [multi_host] Rather node should support multi-host networking mode for HA.
# Optional. Defaults to false. # Optional. Defaults to false.
@@ -221,6 +222,7 @@ class openstack::all (
$bridge_uplinks = undef, $bridge_uplinks = undef,
$tenant_network_type = 'gre', $tenant_network_type = 'gre',
# General # General
$debug = false,
$verbose = false, $verbose = false,
$enabled = true $enabled = true
) { ) {
@@ -305,6 +307,7 @@ class openstack::all (
db_password => $keystone_db_password, db_password => $keystone_db_password,
db_name => $keystone_db_dbname, db_name => $keystone_db_dbname,
db_user => $keystone_db_user, db_user => $keystone_db_user,
debug => $debug,
admin_token => $keystone_admin_token, admin_token => $keystone_admin_token,
admin_tenant => $keystone_admin_tenant, admin_tenant => $keystone_admin_tenant,
admin_email => $admin_email, admin_email => $admin_email,
@@ -329,6 +332,7 @@ class openstack::all (
verbose => $verbose, verbose => $verbose,
db_type => $db_type, db_type => $db_type,
db_host => $db_host, db_host => $db_host,
debug => $debug,
keystone_host => $keystone_host, keystone_host => $keystone_host,
db_user => $glance_db_user, db_user => $glance_db_user,
db_name => $glance_db_dbname, db_name => $glance_db_dbname,
@@ -408,6 +412,7 @@ class openstack::all (
vnc_enabled => $vnc_enabled, vnc_enabled => $vnc_enabled,
vncproxy_host => $vncproxy_host_real, vncproxy_host => $vncproxy_host_real,
# General # General
debug => $debug,
verbose => $verbose, verbose => $verbose,
enabled => $enabled, enabled => $enabled,
} }
@@ -440,6 +445,7 @@ class openstack::all (
} }
class { 'openstack::neutron': class { 'openstack::neutron':
debug => $debug,
# Database # Database
db_host => $db_host, db_host => $db_host,
# Rabbit # Rabbit
@@ -507,6 +513,7 @@ class openstack::all (
class { 'openstack::cinder::all': class { 'openstack::cinder::all':
bind_host => $cinder_bind_address, bind_host => $cinder_bind_address,
debug => $debug,
keystone_auth_host => $keystone_host, keystone_auth_host => $keystone_host,
keystone_password => $cinder_user_password, keystone_password => $cinder_user_password,
rabbit_userid => $rabbit_user, rabbit_userid => $rabbit_user,

6
spec/classes/openstack_all_spec.rb
View File

@@ -121,6 +121,7 @@ describe 'openstack::all' do
:keystone_host => '127.0.0.1', :keystone_host => '127.0.0.1',
:enabled => true, :enabled => true,
:enable_server => true, :enable_server => true,
:debug => false,
:verbose => false :verbose => false
) )
end end
@@ -185,6 +186,7 @@ describe 'openstack::all' do
:keystone_host => '127.0.0.1', :keystone_host => '127.0.0.1',
:enabled => true, :enabled => true,
:enable_server => true, :enable_server => true,
:debug => false,
:verbose => false :verbose => false
) )
end end
@@ -237,6 +239,7 @@ describe 'openstack::all' do
:setup_test_volume => false, :setup_test_volume => false,
:manage_volumes => true, :manage_volumes => true,
:volume_group => 'cinder-volumes', :volume_group => 'cinder-volumes',
:debug => false,
:verbose => false :verbose => false
) )
should contain_nova_config('DEFAULT/volume_api_class').with(:value => 'nova.volume.cinder.API') should contain_nova_config('DEFAULT/volume_api_class').with(:value => 'nova.volume.cinder.API')
@@ -310,6 +313,7 @@ describe 'openstack::all' do
it 'should have openstack::keystone configured' do it 'should have openstack::keystone configured' do
should contain_class('openstack::keystone').with( should contain_class('openstack::keystone').with(
:debug => false,
:verbose => false, :verbose => false,
:db_type => 'mysql', :db_type => 'mysql',
:db_host => '127.0.0.1', :db_host => '127.0.0.1',
@@ -337,6 +341,7 @@ describe 'openstack::all' do
it 'should have openstack::glance configured' do it 'should have openstack::glance configured' do
should contain_class('openstack::glance').with( should contain_class('openstack::glance').with(
:debug => false,
:verbose => false, :verbose => false,
:db_type => 'mysql', :db_type => 'mysql',
:db_host => '127.0.0.1', :db_host => '127.0.0.1',
@@ -399,6 +404,7 @@ describe 'openstack::all' do
:glance_api_servers => '10.0.0.1:9292', :glance_api_servers => '10.0.0.1:9292',
:vnc_enabled => true, :vnc_enabled => true,
:vncproxy_host => '10.0.0.1', :vncproxy_host => '10.0.0.1',
:debug => false,
:verbose => false, :verbose => false,
:enabled => true :enabled => true
) )