Fix OpenDaylight Oxygen deployment failures (master)

ODL scenarios are failing deployment with oxygen because table 17 from
the OpenFlow pipeline is missing. This pulls in an upstream patch to no
longer check for table 17. The default table 17 flow has been removed
upstream which is why it no longer appears during deployment.

This patch fixes master OS branch scenarios only. Once the patch is
cherry-picked to queens we can submit a new patch updating the DS
settings.

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

diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index 313cb1f..53b3bcd 100644 (file)
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -5,6 +5,10 @@ global_params:
     undercloud:
       - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
         project: openstack/tripleo-heat-templates
+    overcloud:
+      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+        project: openstack/puppet-tripleo
+        branch: master
 deploy_options:
   containers: true
   os_version: master

diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index e2b3464..e57d1d3 100644 (file)
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -5,7 +5,10 @@ global_params:
     undercloud:
       - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
         project: openstack/tripleo-heat-templates
-
+    overcloud:
+      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+        project: openstack/puppet-tripleo
+        branch: master
 deploy_options:
   containers: true
   os_version: master