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/nics-template.yaml.jinja2 | |
| parent | d9f9c45d2c2a70877a0e9dd689ddb6173501ae0d (diff) | |
| parent | ffeea8b7aff158a65b5f8c7baf445c6f2206790f (diff) | |
Merge "Fixes using single network (previously called flat) for deploy"
Diffstat (limited to 'build/nics-template.yaml.jinja2')
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 6 |
1 files changed, 3 insertions, 3 deletions
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} |