diff options
| author |   Feng Pan <fpan@redhat.com> | 2016-12-02 22:00:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-02 22:00:51 +0000 |
| commit | 6b0166ef6e4673afee9589d6b55e94236a31a721 (patch) | |
| tree | c6b54cb72fb99a48d5078c4c699ac24b397c4642 /build/network-environment.yaml | |
| parent | d9f9c45d2c2a70877a0e9dd689ddb6173501ae0d (diff) | |
| parent | ffeea8b7aff158a65b5f8c7baf445c6f2206790f (diff) | |
Merge "Fixes using single network (previously called flat) for deploy"
Diffstat (limited to 'build/network-environment.yaml')
| -rw-r--r-- | build/network-environment.yaml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/build/network-environment.yaml b/build/network-environment.yaml index bd65dd9d..8367371b 100644 --- a/build/network-environment.yaml +++ b/build/network-environment.yaml @@ -46,24 +46,7 @@ resource_registry: parameter_defaults: NeutronExternalNetworkBridge: 'br-ex' - ControlPlaneSubnetCidr: "24" - ControlPlaneDefaultRoute: 192.0.2.1 - ExternalNetCidr: 192.168.37.0/24 - ExternalAllocationPools: [{'start': '192.168.37.50', 'end': '192.168.37.99'}] - ExternalInterfaceDefaultRoute: 192.168.37.1 - EC2MetadataIp: 192.0.2.1 - DnsServers: ["8.8.8.8","8.8.4.4"] - TenantNetCidr: 172.17.0.0/24 - TenantAllocationPools: [{'start': '172.17.0.10', 'end': '172.17.0.200'}] - StorageNetCidr: 172.18.0.0/24 - StorageAllocationPools: [{'start': '172.18.0.10', 'end': '172.18.0.200'}] - # Customize the VLAN IDs to match the local environment - InternalApiNetworkVlanID: 10 # usually collapsed onto Admin/Provisioning - StorageNetworkVlanID: 20 - # StorageMgmtNetworkVlanID: 30 # NOT IMPLEMENTED - TenantNetworkVlanID: 40 - ExternalNetworkVlanID: 50 ServiceNetMap: NeutronTenantNetwork: tenant CeilometerApiNetwork: internal_api |