stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Expose security_group_api for nova compute" into stable/grizzly

Browse Source
This commit is contained in:
Jenkins
2013-08-14 19:58:05 +00:00
committed by Gerrit Code Review
parent 43c57ad9eb 8c748d359d
commit 789b6d8b09
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute.pp
View File

@@ -63,6 +63,7 @@ class openstack::compute (
$quantum_firewall_driver = false,
$bridge_mappings = undef,
$bridge_uplinks = undef,
$security_group_api = 'quantum',
# Nova
$nova_admin_tenant_name = 'services',
$nova_admin_user = 'nova',
@@ -248,6 +249,7 @@ class openstack::compute (
quantum_admin_username => $quantum_admin_user,
quantum_admin_tenant_name => $quantum_admin_tenant_name,
quantum_admin_auth_url => "http://${keystone_host}:35357/v2.0",
security_group_api => $security_group_api
}
}

3
spec/classes/openstack_compute_spec.rb
View File

@@ -318,7 +318,8 @@ describe 'openstack::compute' do
:quantum_url => "http://127.0.0.2:9696",
:quantum_admin_tenant_name => 'services',
:quantum_admin_username => 'quantum',
:quantum_admin_auth_url => "http://127.0.0.3:35357/v2.0"
:quantum_admin_auth_url => "http://127.0.0.3:35357/v2.0",
:security_group_api => 'quantum'
)
should_not contain_class('quantum::server')