stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Expose security_group_api for nova compute"

Browse Source
This commit is contained in:
Jenkins
2013-08-14 18:43:14 +00:00
committed by Gerrit Code Review
parent 4b81bd294a 7eb9ceea7a
commit 0b1d6589b2
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 (
$neutron_firewall_driver = false, $neutron_firewall_driver = false,
$bridge_mappings = undef, $bridge_mappings = undef,
$bridge_uplinks = undef, $bridge_uplinks = undef,
$security_group_api = 'neutron',
# Nova # Nova
$nova_admin_tenant_name = 'services', $nova_admin_tenant_name = 'services',
$nova_admin_user = 'nova', $nova_admin_user = 'nova',
@@ -248,6 +249,7 @@ class openstack::compute (
neutron_admin_username => $neutron_admin_user, neutron_admin_username => $neutron_admin_user,
neutron_admin_tenant_name => $neutron_admin_tenant_name, neutron_admin_tenant_name => $neutron_admin_tenant_name,
neutron_admin_auth_url => "http://${keystone_host}:35357/v2.0", neutron_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
:neutron_url => "http://127.0.0.2:9696", :neutron_url => "http://127.0.0.2:9696",
:neutron_admin_tenant_name => 'services', :neutron_admin_tenant_name => 'services',
:neutron_admin_username => 'neutron', :neutron_admin_username => 'neutron',
:neutron_admin_auth_url => "http://127.0.0.3:35357/v2.0" :neutron_admin_auth_url => "http://127.0.0.3:35357/v2.0",
:security_group_api => 'neutron'
) )
should_not contain_class('neutron::server') should_not contain_class('neutron::server')