From: Tim Rozet Date: Tue, 1 Sep 2015 15:33:23 +0000 (-0400) Subject: Fixes external network to services tenant and no dhcp X-Git-Tag: arno.2015.2.0~52^2^2~1^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=genesis.git;a=commitdiff_plain;h=0b37d5341d714a1bf8ef8b5637d8b8fbd7c948c2 Fixes external network to services tenant and no dhcp External network should have been provisioned as services tenant. The external network and subnet are both changed with this patch. The external subnet is also now configured to disable dhcp. JIRA: APEX-9, APEX-10 Change-Id: I3e41dc4b0678efeb0824259147008cf455d8de1e Signed-off-by: Tim Rozet --- diff --git a/common/puppet-opnfv/manifests/external_net_setup.pp b/common/puppet-opnfv/manifests/external_net_setup.pp index af00f20..fc014d4 100644 --- a/common/puppet-opnfv/manifests/external_net_setup.pp +++ b/common/puppet-opnfv/manifests/external_net_setup.pp @@ -60,7 +60,7 @@ class opnfv::external_net_setup { provider_network_type => flat, provider_physical_network => 'physnet1', router_external => true, - tenant_name => 'admin', + tenant_name => 'services', } -> neutron_subnet { 'provider_subnet': @@ -70,8 +70,9 @@ class opnfv::external_net_setup { gateway_ip => $public_gateway, allocation_pools => [ "start=${public_allocation_start},end=${public_allocation_end}" ], dns_nameservers => $public_dns, + enable_dhcp => false, network_name => 'provider_network', - tenant_name => 'admin', + tenant_name => 'services', } -> neutron_router { 'provider_router':