diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/network-environment.yaml | 17 | ||||
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 6 |
2 files changed, 3 insertions, 20 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 diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index ee830114..c7d0a1b8 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -85,13 +85,13 @@ resources: os_net_config: network_config: - - {%- if nets['tenant']['nic_mapping'][role]['vlan'] is number or nets['storage']['nic_mapping'][role]['vlan'] is number or nets['api']['nic_mapping'][role]['vlan'] is number or nets['external'][0]['nic_mapping'][role]['vlan'] is number %} + {%- if not nets['external'][0]['enabled'] or nets['tenant']['nic_mapping'][role]['vlan'] is number or nets['storage']['nic_mapping'][role]['vlan'] is number or nets['api']['nic_mapping'][role]['vlan'] is number or nets['external'][0]['nic_mapping'][role]['vlan'] is number %} type: ovs_bridge name: {get_input: bridge_name} members: - type: interface - name: {{ nets[role]['admin']['members'][0] }} + name: {{ nets['admin']['nic_mapping'][role]['members'][0] }} # force the MAC address of the bridge to this interface primary: true {%- if nets['external'][0]['enabled'] and nets['external'][0]['nic_mapping'][role]['vlan'] is number %} @@ -147,7 +147,7 @@ resources: - ip_netmask: 169.254.169.254/32 next_hop: {get_param: EC2MetadataIp} - {%- if external_net_af == 6 or role == 'compute' %} + {%- if external_net_af == 6 or role == 'compute' or not nets['external'][0]['enabled'] %} - default: true next_hop: {get_param: ControlPlaneDefaultRoute} |