Expose security_group_api for nova compute

This is already done for control node nova config, turns out
its needed for computes. This commit should take care of exposing
parameter so it can be set appropriately to nova/neutron.

Change-Id: I95a6e9e49cc14c4d5f390b271b60b5aaf2ea2278
This commit is contained in:
Pradeep Kilambi
2013-08-14 14:13:33 -04:00
parent 167fe95958
commit 7eb9ceea7a
2 changed files with 4 additions and 1 deletions

View File

@@ -63,6 +63,7 @@ class openstack::compute (
$neutron_firewall_driver = false,
$bridge_mappings = undef,
$bridge_uplinks = undef,
$security_group_api = 'neutron',
# Nova
$nova_admin_tenant_name = 'services',
$nova_admin_user = 'nova',
@@ -248,6 +249,7 @@ class openstack::compute (
neutron_admin_username => $neutron_admin_user,
neutron_admin_tenant_name => $neutron_admin_tenant_name,
neutron_admin_auth_url => "http://${keystone_host}:35357/v2.0",
security_group_api => $security_group_api
}
}

View File

@@ -318,7 +318,8 @@ describe 'openstack::compute' do
:neutron_url => "http://127.0.0.2:9696",
:neutron_admin_tenant_name => 'services',
: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')