stackforge/puppet-openstack
Code Issues Proposed changes

Expose nova security_group_api parameter

Browse Source 
This exposes nova's security_group_api parameter so user can set
this accordingly to nova/neutron or something else if necessary.

Change-Id: I0f166220b819a20a8c6cbc08a4640f29dbac2a0a
This commit is contained in:
Pradeep Kilambi
2013-08-09 11:11:20 -04:00
parent 3693c1f868
commit 551ef6347c
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/controller.pp
View File

@@ -240,6 +240,7 @@ class openstack::controller (
$neutron_db_name = 'neutron', $neutron_db_name = 'neutron',
$neutron_auth_url = 'http://127.0.0.1:35357/v2.0', $neutron_auth_url = 'http://127.0.0.1:35357/v2.0',
$enable_neutron_server = true, $enable_neutron_server = true,
$security_group_api = 'neutron',
# swift # swift
$swift = false, $swift = false,
$swift_public_address = false, $swift_public_address = false,
@@ -402,6 +403,7 @@ class openstack::controller (
neutron => $neutron, neutron => $neutron,
neutron_user_password => $neutron_user_password, neutron_user_password => $neutron_user_password,
metadata_shared_secret => $metadata_shared_secret, metadata_shared_secret => $metadata_shared_secret,
security_group_api => $security_group_api,
# Nova # Nova
nova_admin_tenant_name => $nova_admin_tenant_name, nova_admin_tenant_name => $nova_admin_tenant_name,
nova_admin_user => $nova_admin_user, nova_admin_user => $nova_admin_user,

2
manifests/nova/controller.pp
View File

@@ -74,6 +74,7 @@ class openstack::nova::controller (
$neutron = true, $neutron = true,
$neutron_user_password = false, $neutron_user_password = false,
$metadata_shared_secret = undef, $metadata_shared_secret = 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',
@@ -217,6 +218,7 @@ class openstack::nova::controller (
neutron_admin_tenant_name => 'services', neutron_admin_tenant_name => 'services',
neutron_admin_username => 'neutron', neutron_admin_username => 'neutron',
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,
} }
} }

2
spec/classes/openstack_controller_spec.rb
View File

@@ -597,6 +597,8 @@ describe 'openstack::controller' do
it { should_not contain_class('nova::network') } it { should_not contain_class('nova::network') }
it { should contain_class('nova::network::neutron').with(:security_group_api => 'neutron') }
it 'should configure neutron' do it 'should configure neutron' do
should contain_class('openstack::neutron').with( should contain_class('openstack::neutron').with(

3
spec/classes/openstack_nova_controller_spec.rb
View File

@@ -68,7 +68,8 @@ describe 'openstack::nova::controller' do
:neutron_url => "http://127.0.0.1:9696", :neutron_url => "http://127.0.0.1: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.1:35357/v2.0" :neutron_admin_auth_url => "http://127.0.0.1:35357/v2.0",
:security_group_api => 'neutron'
) )
['nova::scheduler', 'nova::objectstore', 'nova::cert', 'nova::consoleauth', 'nova::conductor'].each do |x| ['nova::scheduler', 'nova::objectstore', 'nova::cert', 'nova::consoleauth', 'nova::conductor'].each do |x|