stackforge/puppet-openstack
Code Issues Proposed changes

Merge "Ensure that test networks are shared"

Browse Source
This commit is contained in:
Jenkins
2013-08-01 22:44:31 +00:00
committed by Gerrit Code Review
parent ebeda3c6ee 862d123e56
commit 217ed97692
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/provision.pp
View File

@@ -117,6 +117,7 @@ class openstack::provision(
ensure => present, ensure => present,
router_external => true, router_external => true,
tenant_name => $admin_tenant_name, tenant_name => $admin_tenant_name,
shared => true,
} }
quantum_subnet { $public_subnet_name: quantum_subnet { $public_subnet_name:
ensure => 'present', ensure => 'present',
@@ -127,6 +128,7 @@ class openstack::provision(
quantum_network { $private_network_name: quantum_network { $private_network_name:
ensure => present, ensure => present,
tenant_name => $tenant_name, tenant_name => $tenant_name,
shared => true,
} }
quantum_subnet { $private_subnet_name: quantum_subnet { $private_subnet_name:
ensure => present, ensure => present,

14
spec/classes/openstack_provision_spec.rb
View File

@@ -24,6 +24,20 @@ describe 'openstack::provision' do
:tempest_repo_revision => 'stable/grizzly' :tempest_repo_revision => 'stable/grizzly'
) } ) }
it 'should configure quantum networks' do
should contain_quantum_network('public').with(
'ensure' => 'present',
'router_external' => true,
'tenant_name' => 'admin',
'shared' => true
)
should contain_quantum_network('private').with(
'ensure' => 'present',
'tenant_name' => 'demo',
'shared' => true
)
end
end end
end end