From: Tim Rozet <trozet@redhat.com>
Date: Mon, 16 Jul 2018 17:49:21 +0000 (-0400)
Subject: Update queens ODL to include OF table fix
X-Git-Tag: opnfv-7.0.0~39
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6b9d8c01be763bbf46048caa08902880367672a7;p=apex.git

Update queens ODL to include OF table fix

Also includes minor fix to patching where stable was not being removed
from the short hand branch name correctly.

Includes fix where path was changed in queens for env files:
https://review.openstack.org/#/c/567810/

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

diff --git a/apex/builders/common_builder.py b/apex/builders/common_builder.py
index 10fab9b6..a5f301b8 100644
--- a/apex/builders/common_builder.py
+++ b/apex/builders/common_builder.py
@@ -175,7 +175,7 @@ def add_upstream_patches(patches, image, tmp_dir,
                                         patch['project'], branch,
                                         patch['change-id'])
         patch_promoted = is_patch_promoted(change,
-                                           branch.replace('/stable', ''),
+                                           branch.replace('stable/', ''),
                                            docker_img)
 
         if patch_diff and not patch_promoted:
diff --git a/apex/common/constants.py b/apex/common/constants.py
index ee260b4f..2a10b3b2 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -41,7 +41,7 @@ THT_DIR = '/usr/share/openstack-tripleo-heat-templates'
 THT_ENV_DIR = os.path.join(THT_DIR, 'environments')
 THT_DOCKER_ENV_DIR = {
     'master': os.path.join(THT_ENV_DIR, 'services'),
-    'queens': os.path.join(THT_ENV_DIR, 'services-docker')
+    'queens': os.path.join(THT_ENV_DIR, 'services')
 }
 
 DEFAULT_OS_VERSION = 'master'
diff --git a/config/deploy/os-odl-queens-ha.yaml b/config/deploy/os-odl-queens-ha.yaml
index 62a12d2b..1295de04 100644
--- a/config/deploy/os-odl-queens-ha.yaml
+++ b/config/deploy/os-odl-queens-ha.yaml
@@ -1,6 +1,11 @@
 ---
 global_params:
   ha_enabled: true
+  patches:
+    overcloud:
+      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+        project: openstack/puppet-tripleo
+        branch: stable/queens
 deploy_options:
   containers: true
   os_version: queens
diff --git a/config/deploy/os-odl-queens-noha.yaml b/config/deploy/os-odl-queens-noha.yaml
index 75a7346c..d3d42476 100644
--- a/config/deploy/os-odl-queens-noha.yaml
+++ b/config/deploy/os-odl-queens-noha.yaml
@@ -2,9 +2,10 @@
 global_params:
   ha_enabled: false
   patches:
-    undercloud:
-      - change-id: Ie380cc41ca50a294a2647d673f339d02111bf6b3
-        project: openstack/tripleo-heat-templates
+    overcloud:
+      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+        project: openstack/puppet-tripleo
+        branch: stable/queens
 deploy_options:
   containers: true
   os_version: queens