diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-07-19 16:51:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-19 16:51:15 +0000 |
| commit | 40925d0cdc63e557ef04569642875cd07b8ed7ce (patch) | |
| tree | 5bff2d016aebc4376197ec0ac4daae344b13e4bd /build | |
| parent | 9f7c8cc97bb73069455b5357c0d4c0dcfc26d5a3 (diff) | |
| parent | 1f5bede73d99f89a3cf1ec5fae7b30cee454b6c8 (diff) | |
Merge "Allows specifying nic order for overcloud nodes in network settings"
Diffstat (limited to 'build')
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index 3fac43b8..0680a26f 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -91,7 +91,7 @@ resources: members: - type: interface - name: nic1 + name: {{ nics[role]['admin_network'] }} # force the MAC address of the bridge to this interface primary: true {%- if 'public_network' in enabled_networks and vlans['public_network'] is number %} @@ -132,7 +132,7 @@ resources: {%- endif %} {%- else %} type: interface - name: nic1 + name: {{ nics[role]['admin_network'] }} {%- endif %} use_dhcp: false dns_servers: {get_param: DnsServers} @@ -153,7 +153,6 @@ resources: next_hop: {get_param: ControlPlaneDefaultRoute} {%- endif %} - {%- set nic_index = 2 %} {%- if 'private_network' in enabled_networks and vlans['private_network'] == 'native' %} {%- if ovs_dpdk_bridge == 'br-phy' and role == 'compute' %} - @@ -166,7 +165,7 @@ resources: members: - type: interface - name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} + name: {{ nics[role]['private_network'] }} # force the MAC address of the bridge to this interface primary: true - @@ -176,7 +175,7 @@ resources: {%- else %} - type: interface - name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} + name: {{ nics[role]['private_network'] }} use_dhcp: false addresses: - @@ -186,7 +185,7 @@ resources: {%- if 'public_network' in enabled_networks and external_net_type == 'interface' and vlans['public_network'] == 'native' %} - type: interface - name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} + name: {{ nics[role]['public_network'] }} {%- if role == 'controller' %} dns_servers: {get_param: DnsServers} {%- endif %} @@ -209,7 +208,7 @@ resources: members: - type: interface - name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} + name: {{ nics[role]['public_network'] }} # force the MAC address of the bridge to this interface primary: true {%- if role == 'controller' %} @@ -227,7 +226,7 @@ resources: {%- if 'storage_network' in enabled_networks and vlans['storage_network'] == 'native' %} - type: interface - name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} + name: {{ nics[role]['storage_network'] }} use_dhcp: false addresses: - @@ -236,7 +235,7 @@ resources: {%- if 'api_network' in enabled_networks and vlans['api_network'] == 'native' %} - type: interface - name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} + name: {{ nics[role]['api_network'] }} use_dhcp: false addresses: - |