diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-09-02 19:21:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-02 19:21:08 +0000 |
| commit | 2b551f29f886a28e609203063418ffeabfe86127 (patch) | |
| tree | 9e9aaf67cb30ec05d6a76dee26744db4d9b7711b | |
| parent | ea46833abc02a09e9682d5bbbb7a8750667e7e6e (diff) | |
| parent | 0b37d5341d714a1bf8ef8b5637d8b8fbd7c948c2 (diff) | |
Merge "Fixes external network to services tenant and no dhcp"
| -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': |