diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-09-04 14:38:56 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-09-04 14:43:31 -0400 |
| commit | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (patch) | |
| tree | 0970daa3d2c30f93fe6aa40cfbfb63549e5182d6 /common/puppet-opnfv/manifests/external_net_setup.pp | |
| parent | ab4950db472c20b57bff533f1f330b5b794aa35b (diff) | |
| parent | 591a1c4327c0793b4a15443f9e72b79ffbeaa226 (diff) | |
Merge branch 'master' into merge-master-arno
Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'common/puppet-opnfv/manifests/external_net_setup.pp')
| -rw-r--r-- | common/puppet-opnfv/manifests/external_net_setup.pp | 5 |
1 files changed, 3 insertions, 2 deletions
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': |