From ea5f72e6594eb9cb98209f966e3b816002e76c14 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 Change-Id: I56d0df5810c04da59532b03a1b586db82a3aa0d7 Signed-off-by: Tim Rozet --- 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 ----------------- 13 files changed, 4 insertions(+), 132 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 (limited to 'config') 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