From 52d9710d26ee044edd55bc905fc135331c3c2101 Mon Sep 17 00:00:00 2001 From: Maru Newby Date: Mon, 5 Aug 2013 11:38:11 -0700 Subject: [PATCH] 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 --- manifests/provision.pp | 2 -- spec/classes/openstack_provision_spec.rb | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/manifests/provision.pp b/manifests/provision.pp index d99d054..b223e52 100644 --- a/manifests/provision.pp +++ b/manifests/provision.pp @@ -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, diff --git a/spec/classes/openstack_provision_spec.rb b/spec/classes/openstack_provision_spec.rb index cb4a521..62a4fae 100644 --- a/spec/classes/openstack_provision_spec.rb +++ b/spec/classes/openstack_provision_spec.rb @@ -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