From 4c064f249a723b0e4a2a0411dcb8cc306e05dff1 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 28 Sep 2018 15:42:49 -0400 Subject: 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 --- build/rpm_specs/opnfv-apex.spec | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'build') diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index 09da36a4..d902d1cb 100644 --- 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 - 7.0-9 + Updates scenario files for Gambia * Thu Sep 27 2018 Tim Rozet - 7.0-8 Adds OVN HA and Queens scenario * Fri Aug 24 2018 Tim Rozet - 7.0-7 -- cgit 1.2.3-korg