From: Tim Rozet <trozet@redhat.com>
Date: Wed, 2 Sep 2015 19:21:08 +0000 (+0000)
Subject: Merge "Fixes external network to services tenant and no dhcp"
X-Git-Tag: arno.2015.2.0~52^2^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2b551f29f886a28e609203063418ffeabfe86127;hp=ea46833abc02a09e9682d5bbbb7a8750667e7e6e;p=genesis.git

Merge "Fixes external network to services tenant and no dhcp"
---

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':