13 files changed, 80 insertions, 17 deletions
diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml
index ac006bdd..d408a161 100644
--- a/config/deploy/common-patches.yaml
+++ b/config/deploy/common-patches.yaml
@@ -11,6 +11,21 @@ patches:
         project: openstack/puppet-tripleo
       - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7
         project: openstack/puppet-tripleo
+  rocky:
+    undercloud:
+      - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36
+        project: openstack/tripleo-common
+        branch: master
+      - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395
+        project: openstack/tripleo-common
+        branch: master
+    overcloud:
+      - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310
+        project: openstack/puppet-tripleo
+        branch: master
+      - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7
+        project: openstack/puppet-tripleo
+        branch: master
   queens:
     undercloud:
       - change-id: I966bf7f6f8d1cbc656abfad59e8bb927e1aa53c2
diff --git a/config/deploy/os-nosdn-calipso_queens-noha.yaml b/config/deploy/os-nosdn-calipso_rocky-noha.yaml
index 48d93f49..b14ceed5 100644
--- a/config/deploy/os-nosdn-calipso_queens-noha.yaml
+++ b/config/deploy/os-nosdn-calipso_rocky-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: queens
+  os_version: rocky
   sdn_controller: false
   sfc: false
   vpn: false
diff --git a/config/deploy/os-nosdn-queens-ha.yaml b/config/deploy/os-nosdn-rocky-ha.yaml
index 88a40042..152a8840 100644
--- a/config/deploy/os-nosdn-queens-ha.yaml
+++ b/config/deploy/os-nosdn-rocky-ha.yaml
@@ -3,7 +3,7 @@ global_params:
   ha_enabled: true
 deploy_options:
   containers: true
-  os_version: queens
+  os_version: rocky
   sdn_controller: false
   tacker: false
   congress: false
diff --git a/config/deploy/os-nosdn-queens-noha.yaml b/config/deploy/os-nosdn-rocky-noha.yaml
index efadc31e..5fecfb6d 100644
--- a/config/deploy/os-nosdn-queens-noha.yaml
+++ b/config/deploy/os-nosdn-rocky-noha.yaml
@@ -3,7 +3,7 @@ global_params:
   ha_enabled: false
 deploy_options:
   containers: true
-  os_version: queens
+  os_version: rocky
   sdn_controller: false
   tacker: false
   congress: false
diff --git a/config/deploy/os-odl-bgpvpn_queens-ha.yaml b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml
index 27a0caf6..a0833fd4 100644
--- a/config/deploy/os-odl-bgpvpn_queens-ha.yaml
+++ b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: queens
+  os_version: rocky
   sdn_controller: opendaylight
   odl_version: master
   tacker: false
diff --git a/config/deploy/os-odl-bgpvpn_queens-noha.yaml b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml
index 33382307..6bc5adf3 100644
--- a/config/deploy/os-odl-bgpvpn_queens-noha.yaml
+++ b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: queens
+  os_version: rocky
   sdn_controller: opendaylight
   odl_version: master
   tacker: false
diff --git a/config/deploy/os-odl-rocky-ha.yaml b/config/deploy/os-odl-rocky-ha.yaml
new file mode 100644
index 00000000..8728bd8d
--- /dev/null
+++ b/config/deploy/os-odl-rocky-ha.yaml
@@ -0,0 +1,13 @@
+---
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  containers: true
+  os_version: rocky
+  sdn_controller: opendaylight
+  odl_version: oxygen
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: false
diff --git a/config/deploy/os-odl-rocky-noha.yaml b/config/deploy/os-odl-rocky-noha.yaml
new file mode 100644
index 00000000..f6ceb81b
--- /dev/null
+++ b/config/deploy/os-odl-rocky-noha.yaml
@@ -0,0 +1,13 @@
+---
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  containers: true
+  os_version: rocky
+  sdn_controller: opendaylight
+  odl_version: oxygen
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: false
diff --git a/config/deploy/os-odl-sfc_queens-ha.yaml b/config/deploy/os-odl-sfc_rocky-ha.yaml
index 0cd01466..3a1b6c93 100644
--- a/config/deploy/os-odl-sfc_queens-ha.yaml
+++ b/config/deploy/os-odl-sfc_rocky-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: queens
+  os_version: rocky
   sdn_controller: opendaylight
   odl_version: master
   tacker: false
diff --git a/config/deploy/os-odl-sfc_queens-noha.yaml b/config/deploy/os-odl-sfc_rocky-noha.yaml
index d091b8cf..8af873a5 100644
--- a/config/deploy/os-odl-sfc_queens-noha.yaml
+++ b/config/deploy/os-odl-sfc_rocky-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: queens
+  os_version: rocky
   sdn_controller: opendaylight
   odl_version: master
   tacker: false
diff --git a/config/deploy/os-ovn-nofeature-ha.yaml b/config/deploy/os-ovn-nofeature-ha.yaml
new file mode 100644
index 00000000..6c42cad9
--- /dev/null
+++ b/config/deploy/os-ovn-nofeature-ha.yaml
@@ -0,0 +1,15 @@
+---
+global_params:
+  ha_enabled: true
+  patches:
+    undercloud:
+      - change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5
+        project: openstack/tripleo-common
+
+deploy_options:
+  containers: true
+  sdn_controller: ovn
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: false
diff --git a/config/deploy/os-ovn-nofeature-noha.yaml b/config/deploy/os-ovn-nofeature-noha.yaml
deleted file mode 100644
index 8c8c5f97..00000000
--- a/config/deploy/os-ovn-nofeature-noha.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: ovn
-  tacker: false
-  congress: true
-  sfc: false
-  vpn: false
diff --git a/config/deploy/os-ovn-rocky-ha.yaml b/config/deploy/os-ovn-rocky-ha.yaml
new file mode 100644
index 00000000..a2c5a865
--- /dev/null
+++ b/config/deploy/os-ovn-rocky-ha.yaml
@@ -0,0 +1,17 @@
+---
+global_params:
+  ha_enabled: true
+  patches:
+    undercloud:
+      - change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5
+        project: openstack/tripleo-common
+        branch: master
+
+deploy_options:
+  containers: true
+  os_version: rocky
+  sdn_controller: ovn
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: false