diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/nics-compute.yaml.jinja2 | 19 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/build/nics-compute.yaml.jinja2 b/build/nics-compute.yaml.jinja2 index 3a73bbd8..1bc2b50a 100644 --- a/build/nics-compute.yaml.jinja2 +++ b/build/nics-compute.yaml.jinja2 @@ -105,6 +105,24 @@ resources: next_hop: {get_param: ControlPlaneDefaultRoute} {%- set nic_index = 2 %} {%- if 'private_network' in enabled_networks %} + {%- if ovs_dpdk_bridge == 'br-phy' %} + - + type: interface + name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} + use_dhcp: false + + - + type: ovs_bridge + name: {{ ovs_dpdk_bridge }} + use_dhcp: false + addresses: + - + ip_netmask: {get_param: TenantIpSubnet} + - + type: ovs_bridge + name: br-tun + use_dhcp: false + {%- else %} - type: interface name: nic{{ nic_index }}{% set nic_index = nic_index + 1 %} @@ -113,6 +131,7 @@ resources: - ip_netmask: {get_param: TenantIpSubnet} {%- endif %} + {%- endif %} {%- if external_net_type == "interface" %} - type: interface diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index 1a8d8461..340053b3 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -29,6 +29,7 @@ git archive --format=tar.gz --prefix=tripleo/ HEAD > ../opnfv-puppet-tripleo.tar popd > /dev/null # download customized os-net-config +rm -fr os-net-config git clone https://github.com/trozet/os-net-config.git -b hiera_nic_mapping pushd os-net-config > /dev/null pushd os_net_config > /dev/null |