summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2019-04-26 17:43:34 -0400
committerTim Rozet <trozet@redhat.com>2019-04-26 17:51:55 -0400
commitea5f72e6594eb9cb98209f966e3b816002e76c14 (patch)
treee7d3465f1e225762dd10600dfadbfc45697009f0
parent8f294ab694a95e60abb29af6f1ef560ae365d436 (diff)
Updates scenario files for hunter branch
Change-Id: I56d0df5810c04da59532b03a1b586db82a3aa0d7 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--apex/common/constants.py2
-rw-r--r--build/rpm_specs/opnfv-apex.spec12
-rw-r--r--config/deploy/os-nosdn-calipso_rocky-noha.yaml11
-rw-r--r--config/deploy/os-nosdn-nofeature-ha.yaml3
-rw-r--r--config/deploy/os-nosdn-nofeature-noha.yaml3
-rw-r--r--config/deploy/os-nosdn-rocky-ha.yaml11
-rw-r--r--config/deploy/os-nosdn-rocky-noha.yaml11
-rw-r--r--config/deploy/os-odl-bgpvpn_rocky-ha.yaml13
-rw-r--r--config/deploy/os-odl-bgpvpn_rocky-noha.yaml13
-rw-r--r--config/deploy/os-odl-rocky-ha.yaml13
-rw-r--r--config/deploy/os-odl-rocky-noha.yaml13
-rw-r--r--config/deploy/os-odl-sfc_rocky-ha.yaml13
-rw-r--r--config/deploy/os-odl-sfc_rocky-noha.yaml13
-rw-r--r--config/deploy/os-ovn-nofeature-ha.yaml2
-rw-r--r--config/deploy/os-ovn-rocky-ha.yaml17
15 files changed, 7 insertions, 143 deletions
diff --git a/apex/common/constants.py b/apex/common/constants.py
index 59988f7..8f5f848 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']
diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index d05397e..a69c8df 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 <trozet@redhat.com> - 8.0-1
+ Update scenarios for Hunter release
* Thu Sep 27 2018 Tim Rozet <trozet@redhat.com> - 8.0-0
Updates from Queens to Rocky
* Fri Aug 24 2018 Tim Rozet <trozet@redhat.com> - 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 b14ceed..0000000
--- 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 d896a67..152a884 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 0725031..5fecfb6 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 152a884..0000000
--- 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 5fecfb6..0000000
--- 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 a0833fd..0000000
--- 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 6bc5adf..0000000
--- 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 8728bd8..0000000
--- 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 f6ceb81..0000000
--- 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 3a1b6c9..0000000
--- 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 8af873a..0000000
--- 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 6c42cad..a2c5a86 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 a2c5a86..0000000
--- 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