Migrates deploy settings for Gambia

With branching to gambia we need to move the settings back to their
proper names and remove OpenStack branch as Queens is the default for
Gambia.

Change-Id: Ia6101289629d89fa349f6554436ccd7c0f8b3c0c
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/apex/common/constants.py b/apex/common/constants.py
index c3e3f5a..b0c21d1 100644 (file)
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -44,7 +44,7 @@ THT_DOCKER_ENV_DIR = {
     'queens': os.path.join(THT_ENV_DIR, 'services')
 }
 
-DEFAULT_OS_VERSION = 'master'
+DEFAULT_OS_VERSION = 'queens'
 DEFAULT_ODL_VERSION = 'oxygen'
 VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master']
 PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \

diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index 09da36a..d902d1c 100644 (file)
--- a/build/rpm_specs/opnfv-apex.spec
+++ b/build/rpm_specs/opnfv-apex.spec
@@ -72,16 +72,11 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-nosdn-bar-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-bar-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-calipso-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-calipso_queens-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-queens-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-nosdn-queens-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-queens-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-queens-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
@@ -89,12 +84,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-sfc-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-sfc-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-sfc_queens-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl-sfc_queens-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_netvirt-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml
@@ -110,7 +101,6 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-odl-sriov-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-ovn-nofeature-ha.yaml
-%{_sysconfdir}/opnfv-apex/os-ovn-queens-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml
@@ -130,6 +120,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
+* Fri Sep 28 2018 Tim Rozet <trozet@redhat.com> - 7.0-9
+  Updates scenario files for Gambia
 * Thu Sep 27 2018 Tim Rozet <trozet@redhat.com> - 7.0-8
   Adds OVN HA and Queens scenario
 * Fri Aug 24 2018 Tim Rozet <trozet@redhat.com> - 7.0-7

diff --git a/config/deploy/os-nosdn-calipso-noha.yaml b/config/deploy/os-nosdn-calipso-noha.yaml
index 6502bcb..48d93f4 100644 (file)
--- a/config/deploy/os-nosdn-calipso-noha.yaml
+++ b/config/deploy/os-nosdn-calipso-noha.yaml
@@ -4,6 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
+  os_version: queens
   sdn_controller: false
   sfc: false
   vpn: false

diff --git a/config/deploy/os-nosdn-calipso_queens-noha.yaml b/config/deploy/os-nosdn-calipso_queens-noha.yaml
deleted file mode 100644 (file)
index 48d93f4..0000000
--- a/config/deploy/os-nosdn-calipso_queens-noha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  containers: true
-  os_version: queens
-  sdn_controller: false
-  sfc: false
-  vpn: false
-  calipso: true

diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index d896a67..88a4004 100644 (file)
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -1,10 +1,9 @@
 ---
 global_params:
   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-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index 0725031..efadc31 100644 (file)
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -1,10 +1,9 @@
 ---
 global_params:
   ha_enabled: false
-
 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-ha.yaml b/config/deploy/os-nosdn-queens-ha.yaml
deleted file mode 100644 (file)
index 88a4004..0000000
--- a/config/deploy/os-nosdn-queens-ha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-global_params:
-  ha_enabled: true
-deploy_options:
-  containers: true
-  os_version: queens
-  sdn_controller: false
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: false

diff --git a/config/deploy/os-nosdn-queens-noha.yaml b/config/deploy/os-nosdn-queens-noha.yaml
deleted file mode 100644 (file)
index efadc31..0000000
--- a/config/deploy/os-nosdn-queens-noha.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-global_params:
-  ha_enabled: false
-deploy_options:
-  containers: true
-  os_version: queens
-  sdn_controller: false
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: false

diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml
index f61e1a6..27a0caf 100644 (file)
--- a/config/deploy/os-odl-bgpvpn-ha.yaml
+++ b/config/deploy/os-odl-bgpvpn-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: master
+  os_version: queens
   sdn_controller: opendaylight
   odl_version: master
   tacker: false

diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml
index 4bf90aa..3338230 100644 (file)
--- a/config/deploy/os-odl-bgpvpn-noha.yaml
+++ b/config/deploy/os-odl-bgpvpn-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: master
+  os_version: queens
   sdn_controller: opendaylight
   odl_version: master
   tacker: false

diff --git a/config/deploy/os-odl-bgpvpn_queens-ha.yaml b/config/deploy/os-odl-bgpvpn_queens-ha.yaml
deleted file mode 100644 (file)
index 27a0caf..0000000
--- 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 (file)
index 3338230..0000000
--- 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

diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index 748da3c..9738be3 100644 (file)
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -4,9 +4,9 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: master
+  os_version: queens
   sdn_controller: opendaylight
-  odl_version: master
+  odl_version: oxygen
   tacker: false
   congress: false
   sfc: false

diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index 0767822..0500eec 100644 (file)
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -4,9 +4,9 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: master
+  os_version: queens
   sdn_controller: opendaylight
-  odl_version: master
+  odl_version: oxygen
   tacker: false
   congress: false
   sfc: false

diff --git a/config/deploy/os-odl-queens-ha.yaml b/config/deploy/os-odl-queens-ha.yaml
deleted file mode 100644 (file)
index 9738be3..0000000
--- a/config/deploy/os-odl-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: oxygen
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: false

diff --git a/config/deploy/os-odl-queens-noha.yaml b/config/deploy/os-odl-queens-noha.yaml
deleted file mode 100644 (file)
index 0500eec..0000000
--- a/config/deploy/os-odl-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: oxygen
-  tacker: false
-  congress: false
-  sfc: false
-  vpn: false

diff --git a/config/deploy/os-odl-sfc-ha.yaml b/config/deploy/os-odl-sfc-ha.yaml
index e8df117..0cd0146 100644 (file)
--- a/config/deploy/os-odl-sfc-ha.yaml
+++ b/config/deploy/os-odl-sfc-ha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: master
+  os_version: queens
   sdn_controller: opendaylight
   odl_version: master
   tacker: false

diff --git a/config/deploy/os-odl-sfc-noha.yaml b/config/deploy/os-odl-sfc-noha.yaml
index 3dac36f..d091b8c 100644 (file)
--- a/config/deploy/os-odl-sfc-noha.yaml
+++ b/config/deploy/os-odl-sfc-noha.yaml
@@ -4,7 +4,7 @@ global_params:
 
 deploy_options:
   containers: true
-  os_version: master
+  os_version: queens
   sdn_controller: opendaylight
   odl_version: master
   tacker: false

diff --git a/config/deploy/os-odl-sfc_queens-ha.yaml b/config/deploy/os-odl-sfc_queens-ha.yaml
deleted file mode 100644 (file)
index 0cd0146..0000000
--- a/config/deploy/os-odl-sfc_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: true
-  vpn: false

diff --git a/config/deploy/os-odl-sfc_queens-noha.yaml b/config/deploy/os-odl-sfc_queens-noha.yaml
deleted file mode 100644 (file)
index d091b8c..0000000
--- a/config/deploy/os-odl-sfc_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: true
-  vpn: false

diff --git a/config/deploy/os-ovn-nofeature-ha.yaml b/config/deploy/os-ovn-nofeature-ha.yaml
index 6c42cad..fe79068 100644 (file)
--- a/config/deploy/os-ovn-nofeature-ha.yaml
+++ b/config/deploy/os-ovn-nofeature-ha.yaml
@@ -5,9 +5,11 @@ global_params:
     undercloud:
       - change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5
         project: openstack/tripleo-common
+        branch: master
 
 deploy_options:
   containers: true
+  os_version: queens
   sdn_controller: ovn
   tacker: false
   congress: false

diff --git a/config/deploy/os-ovn-queens-ha.yaml b/config/deploy/os-ovn-queens-ha.yaml
deleted file mode 100644 (file)
index fe79068..0000000
--- a/config/deploy/os-ovn-queens-ha.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-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