Revert provisioning of shared networks.

* As currently defined, the public network is configured to
   support floating ip assignment, and the private network should
   be private to the tenant.  In neither case should the network
   be configured as shared.

Change-Id: I51f7cd75cfd2b8a5a1aadad45b98dd010c0f1935
This commit is contained in:
Maru Newby
2013-08-05 11:38:11 -07:00
parent 2cf91517f3
commit 52d9710d26
2 changed files with 2 additions and 6 deletions

View File

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

View File

@@ -28,13 +28,11 @@ describe 'openstack::provision' do
should contain_quantum_network('public').with(
'ensure' => 'present',
'router_external' => true,
'tenant_name' => 'admin',
'shared' => true
'tenant_name' => 'admin'
)
should contain_quantum_network('private').with(
'ensure' => 'present',
'tenant_name' => 'demo',
'shared' => true
'tenant_name' => 'demo'
)
end