11 files changed, 40 insertions, 61 deletions
diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 93a1fb6f..13bf6d89 100644
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -1,10 +1,15 @@
 ---
 global_params:
   ha_enabled: true
-
+  patches:
+    undercloud:
+      - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
+        project: openstack/tripleo-heat-templates
 deploy_options:
+  containers: true
+  os_version: master
   sdn_controller: false
-  tacker: true
-  congress: true
+  tacker: false
+  congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index 77e5d5e2..0b1aaa04 100644
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -1,10 +1,15 @@
 ---
 global_params:
   ha_enabled: false
-
+  patches:
+    undercloud:
+      - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
+        project: openstack/tripleo-heat-templates
 deploy_options:
+  containers: true
+  os_version: master
   sdn_controller: false
-  tacker: true
-  congress: true
+  tacker: false
+  congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-pike_upstream-noha.yaml b/config/deploy/os-nosdn-pike_upstream-noha.yaml
deleted file mode 100644
index 11417840..00000000
--- a/config/deploy/os-nosdn-pike_upstream-noha.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-global_params:
-  ha_enabled: false
-  patches:
-    undercloud:
-      - change-id: I301370fbf47a71291614dd60e4c64adc7b5ebb42
-        project: openstack/tripleo-heat-templates
-deploy_options:
-  os_version: pike
-  sdn_controller: false
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: false
diff --git a/config/deploy/os-nosdn-master_upstream-noha.yaml b/config/deploy/os-nosdn-queens-ha.yaml
index e7758113..88a40042 100644
--- a/config/deploy/os-nosdn-master_upstream-noha.yaml
+++ b/config/deploy/os-nosdn-queens-ha.yaml
@@ -1,9 +1,9 @@
 ---
 global_params:
-  ha_enabled: false
+  ha_enabled: true
 deploy_options:
   containers: true
-  os_version: master
+  os_version: queens
   sdn_controller: false
   tacker: false
   congress: false
diff --git a/config/deploy/os-nosdn-queens_upstream-noha.yaml b/config/deploy/os-nosdn-queens-noha.yaml
index efadc31e..efadc31e 100644
--- a/config/deploy/os-nosdn-queens_upstream-noha.yaml
+++ b/config/deploy/os-nosdn-queens-noha.yaml
diff --git a/config/deploy/os-odl-csit-noha.yaml b/config/deploy/os-odl-csit-noha.yaml
deleted file mode 100644
index 634b6cb5..00000000
--- a/config/deploy/os-odl-csit-noha.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  odl_version: nitrogen
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: false
-  ceph: false
diff --git a/config/deploy/os-odl-master_upstream-noha.yaml b/config/deploy/os-odl-master_upstream-noha.yaml
deleted file mode 100644
index 39ced494..00000000
--- a/config/deploy/os-odl-master_upstream-noha.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-global_params:
-  ha_enabled: false
-  patches:
-    undercloud:
-      - change-id: Ie380cc41ca50a294a2647d673f339d02111bf6b3
-        project: openstack/tripleo-heat-templates
-deploy_options:
-  containers: true
-  os_version: master
-  sdn_controller: opendaylight
-  odl_version: master
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: false
diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index 4dd31e9e..313cb1f4 100644
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -1,11 +1,16 @@
 ---
 global_params:
   ha_enabled: true
-
+  patches:
+    undercloud:
+      - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
+        project: openstack/tripleo-heat-templates
 deploy_options:
+  containers: true
+  os_version: master
   sdn_controller: opendaylight
-  odl_version: nitrogen
-  tacker: true
-  congress: true
+  odl_version: master
+  tacker: false
+  congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index 271d2717..e2b34642 100644
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -1,11 +1,17 @@
 ---
 global_params:
   ha_enabled: false
+  patches:
+    undercloud:
+      - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
+        project: openstack/tripleo-heat-templates
 
 deploy_options:
+  containers: true
+  os_version: master
   sdn_controller: opendaylight
-  odl_version: nitrogen
-  tacker: true
-  congress: true
+  odl_version: master
+  tacker: false
+  congress: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-odl-pike_upstream-noha.yaml b/config/deploy/os-odl-queens-ha.yaml
index 3fe1c734..62a12d2b 100644
--- a/config/deploy/os-odl-pike_upstream-noha.yaml
+++ b/config/deploy/os-odl-queens-ha.yaml
@@ -1,11 +1,11 @@
 ---
 global_params:
-  ha_enabled: false
+  ha_enabled: true
 deploy_options:
-  containers: false
-  os_version: pike
+  containers: true
+  os_version: queens
   sdn_controller: opendaylight
-  odl_version: carbon
+  odl_version: oxygen
   tacker: false
   congress: false
   sfc: false
diff --git a/config/deploy/os-odl-queens_upstream-noha.yaml b/config/deploy/os-odl-queens-noha.yaml
index 75a7346c..75a7346c 100644
--- a/config/deploy/os-odl-queens_upstream-noha.yaml
+++ b/config/deploy/os-odl-queens-noha.yaml