diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-30 02:55:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-30 02:55:59 +0000 |
| commit | 1e1d187d9c64229ddfb97925bb1b46a1754e6cd1 (patch) | |
| tree | 95ca884a823cf55c9ea03356f200eea9c7ce3737 | |
| parent | afd9be35f7f8a3b8865260466fad2103a07a0c8c (diff) | |
| parent | 82eb310ef1c83108b5889b43ca87a1b59a59c474 (diff) | |
Merge "Fixes multiple issues in ovs dpdk"
| -rw-r--r-- | build/nics-template.yaml.jinja2 | 2 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2 index a0333149..1c51ab7f 100644 --- a/build/nics-template.yaml.jinja2 +++ b/build/nics-template.yaml.jinja2 @@ -155,7 +155,7 @@ resources: {%- set nic_index = 2 %} {%- if 'private_network' in enabled_networks and vlans['private_network'] == 'native' %} - {%- if ovs_dpdk_bridge == 'br-phy' %} + {%- if ovs_dpdk_bridge == 'br-phy' and role == 'compute' %} - type: ovs_bridge name: {{ ovs_dpdk_bridge }} diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh index f35e3ceb..777fa1c5 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -35,7 +35,7 @@ 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 +git clone https://github.com/trozet/os-net-config.git -b stable/colorado pushd os-net-config > /dev/null pushd os_net_config > /dev/null git archive --format=tar.gz --prefix=os_net_config/ HEAD > ../../os-net-config.tar.gz |