From 5323516116ea6bd8e67d3b9d21cd6451b59e96e9 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Tue, 30 Apr 2019 18:24:53 +0000 Subject: Revert "Updates scenario files for hunter branch" This reverts commit ea5f72e6594eb9cb98209f966e3b816002e76c14. Should have been only applied to hunter branch. Change-Id: I9331e4060af4d29165ea5bfaf7e38e200bbdc069 Signed-off-by: Tim Rozet --- apex/common/constants.py | 2 +- build/rpm_specs/opnfv-apex.spec | 12 ++++++++++-- config/deploy/os-nosdn-calipso_rocky-noha.yaml | 11 +++++++++++ config/deploy/os-nosdn-nofeature-ha.yaml | 3 ++- config/deploy/os-nosdn-nofeature-noha.yaml | 3 ++- config/deploy/os-nosdn-rocky-ha.yaml | 11 +++++++++++ config/deploy/os-nosdn-rocky-noha.yaml | 11 +++++++++++ config/deploy/os-odl-bgpvpn_rocky-ha.yaml | 13 +++++++++++++ config/deploy/os-odl-bgpvpn_rocky-noha.yaml | 13 +++++++++++++ config/deploy/os-odl-rocky-ha.yaml | 13 +++++++++++++ config/deploy/os-odl-rocky-noha.yaml | 13 +++++++++++++ config/deploy/os-odl-sfc_rocky-ha.yaml | 13 +++++++++++++ config/deploy/os-odl-sfc_rocky-noha.yaml | 13 +++++++++++++ config/deploy/os-ovn-nofeature-ha.yaml | 2 -- config/deploy/os-ovn-rocky-ha.yaml | 17 +++++++++++++++++ 15 files changed, 143 insertions(+), 7 deletions(-) create mode 100644 config/deploy/os-nosdn-calipso_rocky-noha.yaml create mode 100644 config/deploy/os-nosdn-rocky-ha.yaml create mode 100644 config/deploy/os-nosdn-rocky-noha.yaml create mode 100644 config/deploy/os-odl-bgpvpn_rocky-ha.yaml create mode 100644 config/deploy/os-odl-bgpvpn_rocky-noha.yaml create mode 100644 config/deploy/os-odl-rocky-ha.yaml create mode 100644 config/deploy/os-odl-rocky-noha.yaml create mode 100644 config/deploy/os-odl-sfc_rocky-ha.yaml create mode 100644 config/deploy/os-odl-sfc_rocky-noha.yaml create mode 100644 config/deploy/os-ovn-rocky-ha.yaml diff --git a/apex/common/constants.py b/apex/common/constants.py index 8f5f848d..59988f74 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -41,7 +41,7 @@ THT_DIR = '/usr/share/openstack-tripleo-heat-templates' THT_ENV_DIR = os.path.join(THT_DIR, 'environments') THT_DOCKER_ENV_DIR = os.path.join(THT_ENV_DIR, 'services') -DEFAULT_OS_VERSION = 'rocky' +DEFAULT_OS_VERSION = 'master' DEFAULT_ODL_VERSION = 'oxygen' VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'fluorine', 'neon', 'master'] diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index a69c8df4..d05397ed 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -72,13 +72,18 @@ 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_rocky-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-rocky-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-rocky-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-queens-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-queens-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-rocky-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-rocky-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 @@ -86,8 +91,12 @@ 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_rocky-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn_rocky-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-sfc-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-sfc-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-sfc_rocky-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-sfc_rocky-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 @@ -103,6 +112,7 @@ 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-rocky-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 @@ -122,8 +132,6 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog -* Fri Apr 26 2019 Tim Rozet - 8.0-1 - Update scenarios for Hunter release * Thu Sep 27 2018 Tim Rozet - 8.0-0 Updates from Queens to Rocky * Fri Aug 24 2018 Tim Rozet - 7.0-7 diff --git a/config/deploy/os-nosdn-calipso_rocky-noha.yaml b/config/deploy/os-nosdn-calipso_rocky-noha.yaml new file mode 100644 index 00000000..b14ceed5 --- /dev/null +++ b/config/deploy/os-nosdn-calipso_rocky-noha.yaml @@ -0,0 +1,11 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: rocky + 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 152a8840..d896a672 100644 --- a/config/deploy/os-nosdn-nofeature-ha.yaml +++ b/config/deploy/os-nosdn-nofeature-ha.yaml @@ -1,9 +1,10 @@ --- global_params: ha_enabled: true + deploy_options: containers: true - os_version: rocky + os_version: master 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 5fecfb6d..0725031f 100644 --- a/config/deploy/os-nosdn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-nofeature-noha.yaml @@ -1,9 +1,10 @@ --- global_params: ha_enabled: false + deploy_options: containers: true - os_version: rocky + os_version: master sdn_controller: false tacker: false congress: false diff --git a/config/deploy/os-nosdn-rocky-ha.yaml b/config/deploy/os-nosdn-rocky-ha.yaml new file mode 100644 index 00000000..152a8840 --- /dev/null +++ b/config/deploy/os-nosdn-rocky-ha.yaml @@ -0,0 +1,11 @@ +--- +global_params: + ha_enabled: true +deploy_options: + containers: true + os_version: rocky + sdn_controller: false + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-nosdn-rocky-noha.yaml b/config/deploy/os-nosdn-rocky-noha.yaml new file mode 100644 index 00000000..5fecfb6d --- /dev/null +++ b/config/deploy/os-nosdn-rocky-noha.yaml @@ -0,0 +1,11 @@ +--- +global_params: + ha_enabled: false +deploy_options: + containers: true + os_version: rocky + sdn_controller: false + tacker: false + congress: false + sfc: false + vpn: false diff --git a/config/deploy/os-odl-bgpvpn_rocky-ha.yaml b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml new file mode 100644 index 00000000..a0833fd4 --- /dev/null +++ b/config/deploy/os-odl-bgpvpn_rocky-ha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: master + tacker: false + congress: false + sfc: false + vpn: true diff --git a/config/deploy/os-odl-bgpvpn_rocky-noha.yaml b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml new file mode 100644 index 00000000..6bc5adf3 --- /dev/null +++ b/config/deploy/os-odl-bgpvpn_rocky-noha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: master + tacker: false + congress: false + sfc: false + vpn: true 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_rocky-ha.yaml b/config/deploy/os-odl-sfc_rocky-ha.yaml new file mode 100644 index 00000000..3a1b6c93 --- /dev/null +++ b/config/deploy/os-odl-sfc_rocky-ha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: true + +deploy_options: + containers: true + os_version: rocky + sdn_controller: opendaylight + odl_version: master + tacker: false + congress: false + sfc: true + vpn: false diff --git a/config/deploy/os-odl-sfc_rocky-noha.yaml b/config/deploy/os-odl-sfc_rocky-noha.yaml new file mode 100644 index 00000000..8af873a5 --- /dev/null +++ b/config/deploy/os-odl-sfc_rocky-noha.yaml @@ -0,0 +1,13 @@ +--- +global_params: + ha_enabled: false + +deploy_options: + containers: true + os_version: rocky + 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 a2c5a865..6c42cad9 100644 --- a/config/deploy/os-ovn-nofeature-ha.yaml +++ b/config/deploy/os-ovn-nofeature-ha.yaml @@ -5,11 +5,9 @@ global_params: undercloud: - change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5 project: openstack/tripleo-common - branch: master deploy_options: containers: true - os_version: rocky sdn_controller: ovn tacker: false congress: 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 -- cgit 1.2.3-korg