From b88eb3c7a1578cb251282c358fad6d87e7439868 Mon Sep 17 00:00:00 2001
From: Ricardo Noriega <rnoriega@redhat.com>
Date: Fri, 3 Aug 2018 15:18:06 +0200
Subject: Fix BGPVPN Queens scenario files to be consistent

Change-Id: Id5b932246020676e1e53438db689e32bc124939e
Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
---
 build/rpm_specs/opnfv-apex.spec              |  4 ++--
 config/deploy/os-odl-bgpvpn-queens-ha.yaml   | 13 +++++++++++++
 config/deploy/os-odl-bgpvpn-queens-noha.yaml | 13 +++++++++++++
 config/deploy/os-odl-bgpvpn_queens-ha.yaml   | 13 -------------
 config/deploy/os-odl-bgpvpn_queens-noha.yaml | 13 -------------
 5 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 config/deploy/os-odl-bgpvpn-queens-ha.yaml
 create mode 100644 config/deploy/os-odl-bgpvpn-queens-noha.yaml
 delete mode 100644 config/deploy/os-odl-bgpvpn_queens-ha.yaml
 delete mode 100644 config/deploy/os-odl-bgpvpn_queens-noha.yaml

diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index c344dfda..f6712e9a 100644
--- a/build/rpm_specs/opnfv-apex.spec
+++ b/build/rpm_specs/opnfv-apex.spec
@@ -87,8 +87,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm_ovs_dpdk-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn_queens-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn_queens-noha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-queens-ha.yaml
+%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-queens-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-sfc-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-sfc-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
diff --git a/config/deploy/os-odl-bgpvpn-queens-ha.yaml b/config/deploy/os-odl-bgpvpn-queens-ha.yaml
new file mode 100644
index 00000000..27a0caf6
--- /dev/null
+++ b/config/deploy/os-odl-bgpvpn-queens-ha.yaml
@@ -0,0 +1,13 @@
+---
+global_params:
+  ha_enabled: true
+
+deploy_options:
+  containers: true
+  os_version: queens
+  sdn_controller: opendaylight
+  odl_version: master
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: true
diff --git a/config/deploy/os-odl-bgpvpn-queens-noha.yaml b/config/deploy/os-odl-bgpvpn-queens-noha.yaml
new file mode 100644
index 00000000..33382307
--- /dev/null
+++ b/config/deploy/os-odl-bgpvpn-queens-noha.yaml
@@ -0,0 +1,13 @@
+---
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  containers: true
+  os_version: queens
+  sdn_controller: opendaylight
+  odl_version: master
+  tacker: false
+  congress: false
+  sfc: false
+  vpn: true
diff --git a/config/deploy/os-odl-bgpvpn_queens-ha.yaml b/config/deploy/os-odl-bgpvpn_queens-ha.yaml
deleted file mode 100644
index 27a0caf6..00000000
--- a/config/deploy/os-odl-bgpvpn_queens-ha.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  containers: true
-  os_version: queens
-  sdn_controller: opendaylight
-  odl_version: master
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: true
diff --git a/config/deploy/os-odl-bgpvpn_queens-noha.yaml b/config/deploy/os-odl-bgpvpn_queens-noha.yaml
deleted file mode 100644
index 33382307..00000000
--- a/config/deploy/os-odl-bgpvpn_queens-noha.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  containers: true
-  os_version: queens
-  sdn_controller: opendaylight
-  odl_version: master
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: true
-- 
cgit 1.2.3-korg