Fixes multiple issues in ovs dpdk

Changes include:
 - Fixes nova schedulers to be an array instead of string
 - Fixes os-net-config to only run one time with dpdk nodes
 - Fixes br-phy creation to only happen on compute nodes

opnfv-tht-pr: 32

Change-Id: Ic3ef9ba247535ed00e40fe3fc4f0e78ac7d01c1a
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index a033314..1c51ab7 100644 (file)
--- 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 f35e3ce..777fa1c 100755 (executable)
--- 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