Enable OVN scenarios

As of Queens only HA OVN deployments are supported.

Change-Id: I184c5a096fec9cbc3cf2ec06218700138ea3ed57
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit ee58a24647df8eec2418735b038e5035bdffe10d)

3 files changed, 32 insertions, 10 deletions

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-queens-ha.yaml b/config/deploy/os-ovn-queens-ha.yaml
new file mode 100644
index 00000000..fe79068d
--- /dev/null
+++ b/config/deploy/os-ovn-queens-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: queens
+  sdn_controller: ovn
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: false