9 files changed, 28 insertions, 34 deletions
diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml
index 7339e79c..ac006bdd 100644
--- a/config/deploy/common-patches.yaml
+++ b/config/deploy/common-patches.yaml
@@ -1,8 +1,22 @@
 ---
 patches:
-  undercloud:
-    - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
-      project: openstack/tripleo-common
-    - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395
-      project: openstack/tripleo-common
-      branch: master
+  master:
+    undercloud:
+      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+        project: openstack/tripleo-common
+      - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395
+        project: openstack/tripleo-common
+    overcloud:
+      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+        project: openstack/puppet-tripleo
+      - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7
+        project: openstack/puppet-tripleo
+  queens:
+    undercloud:
+      - change-id: I966bf7f6f8d1cbc656abfad59e8bb927e1aa53c2
+        project: openstack/tripleo-common
+    overcloud:
+      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+        project: openstack/puppet-tripleo
+      - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7
+        project: openstack/puppet-tripleo
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 26d30e5e..d896a672 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -1,6 +1,7 @@
 ---
 global_params:
   ha_enabled: true
+
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index e7758113..0725031f 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -1,6 +1,7 @@
 ---
 global_params:
   ha_enabled: false
+
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml
index 80b5b3b1..f61e1a60 100644
--- a/config/deploy/os-odl-bgpvpn-ha.yaml
+++ b/config/deploy/os-odl-bgpvpn-ha.yaml
@@ -1,10 +1,7 @@
 ---
 global_params:
   ha_enabled: true
-  patches:
-    undercloud:
-      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
-        project: openstack/tripleo-common
+
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml
index 04dbaa89..4bf90aa7 100644
--- a/config/deploy/os-odl-bgpvpn-noha.yaml
+++ b/config/deploy/os-odl-bgpvpn-noha.yaml
@@ -1,10 +1,7 @@
 ---
 global_params:
   ha_enabled: false
-  patches:
-    undercloud:
-      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
-        project: openstack/tripleo-common
+
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index a1f0d81e..748da3c7 100644
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -1,11 +1,7 @@
 ---
 global_params:
   ha_enabled: true
-  patches:
-    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 55f14426..0767822b 100644
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -1,11 +1,7 @@
 ---
 global_params:
   ha_enabled: false
-  patches:
-    overcloud:
-      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
-        project: openstack/puppet-tripleo
-        branch: master
+
 deploy_options:
   containers: true
   os_version: master
diff --git a/config/deploy/os-odl-queens-ha.yaml b/config/deploy/os-odl-queens-ha.yaml
index 1295de04..9738be38 100644
--- a/config/deploy/os-odl-queens-ha.yaml
+++ b/config/deploy/os-odl-queens-ha.yaml
@@ -1,11 +1,7 @@
 ---
 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 d3d42476..0500eec1 100644
--- a/config/deploy/os-odl-queens-noha.yaml
+++ b/config/deploy/os-odl-queens-noha.yaml
@@ -1,11 +1,7 @@
 ---
 global_params:
   ha_enabled: false
-  patches:
-    overcloud:
-      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
-        project: openstack/puppet-tripleo
-        branch: stable/queens
+
 deploy_options:
   containers: true
   os_version: queens