From 237dc19886b4ae03c42f584999d1dff466b6c6da Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 26 Apr 2019 17:43:34 -0400 Subject: Updates scenario files for hunter branch Removes dependency on python2-networking-sfc Change-Id: I56d0df5810c04da59532b03a1b586db82a3aa0d7 Signed-off-by: Tim Rozet --- apex/builders/undercloud_builder.py | 1 - apex/common/constants.py | 6 +++--- 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 ----------------- 16 files changed, 9 insertions(+), 146 deletions(-) delete mode 100644 config/deploy/os-nosdn-calipso_rocky-noha.yaml delete mode 100644 config/deploy/os-nosdn-rocky-ha.yaml delete mode 100644 config/deploy/os-nosdn-rocky-noha.yaml delete mode 100644 config/deploy/os-odl-bgpvpn_rocky-ha.yaml delete mode 100644 config/deploy/os-odl-bgpvpn_rocky-noha.yaml delete mode 100644 config/deploy/os-odl-rocky-ha.yaml delete mode 100644 config/deploy/os-odl-rocky-noha.yaml delete mode 100644 config/deploy/os-odl-sfc_rocky-ha.yaml delete mode 100644 config/deploy/os-odl-sfc_rocky-noha.yaml delete mode 100644 config/deploy/os-ovn-rocky-ha.yaml diff --git a/apex/builders/undercloud_builder.py b/apex/builders/undercloud_builder.py index 47d2568d..4edde5a6 100644 --- a/apex/builders/undercloud_builder.py +++ b/apex/builders/undercloud_builder.py @@ -28,7 +28,6 @@ def add_upstream_packages(image): pkgs = [ 'epel-release', 'openstack-utils', - 'python2-networking-sfc', 'openstack-ironic-inspector', 'subunit-filters', 'docker-distribution', diff --git a/apex/common/constants.py b/apex/common/constants.py index 59988f74..01cb2b7b 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 = 'master' +DEFAULT_OS_VERSION = 'rocky' DEFAULT_ODL_VERSION = 'oxygen' VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'fluorine', 'neon', 'master'] @@ -51,8 +51,8 @@ DEBUG_OVERCLOUD_PW = 'opnfvapex' NET_ENV_FILE = 'network-environment.yaml' DEPLOY_TIMEOUT = 120 RDO_TAG = 'current-tripleo' -UPSTREAM_RDO = "https://images.rdoproject.org/master/rdo_trunk/{}/".format( - RDO_TAG) +UPSTREAM_RDO = "https://images.rdoproject.org/{}/rdo_trunk/{}/".format( + DEFAULT_OS_VERSION, RDO_TAG) OPENSTACK_GERRIT = 'https://review.opendev.org' DOCKER_TAG = RDO_TAG diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index d05397ed..a69c8df4 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -72,18 +72,13 @@ 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 @@ -91,12 +86,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_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 @@ -112,7 +103,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-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 @@ -132,6 +122,8 @@ 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 deleted file mode 100644 index b14ceed5..00000000 --- a/config/deploy/os-nosdn-calipso_rocky-noha.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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 d896a672..152a8840 100644 --- 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: rocky 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 0725031f..5fecfb6d 100644 --- 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: rocky 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 deleted file mode 100644 index 152a8840..00000000 --- a/config/deploy/os-nosdn-rocky-ha.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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 deleted file mode 100644 index 5fecfb6d..00000000 --- a/config/deploy/os-nosdn-rocky-noha.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -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 deleted file mode 100644 index a0833fd4..00000000 --- a/config/deploy/os-odl-bgpvpn_rocky-ha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 deleted file mode 100644 index 6bc5adf3..00000000 --- a/config/deploy/os-odl-bgpvpn_rocky-noha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 deleted file mode 100644 index 8728bd8d..00000000 --- a/config/deploy/os-odl-rocky-ha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 deleted file mode 100644 index f6ceb81b..00000000 --- a/config/deploy/os-odl-rocky-noha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 deleted file mode 100644 index 3a1b6c93..00000000 --- a/config/deploy/os-odl-sfc_rocky-ha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 deleted file mode 100644 index 8af873a5..00000000 --- a/config/deploy/os-odl-sfc_rocky-noha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -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 6c42cad9..a2c5a865 100644 --- 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: 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 deleted file mode 100644 index a2c5a865..00000000 --- a/config/deploy/os-ovn-rocky-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: rocky - sdn_controller: ovn - tacker: false - congress: false - sfc: false - vpn: false -- cgit 1.2.3-korg