From df388a8afedc29f9cfebdab3cc39ef27f93d9612 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 28 Sep 2018 16:01:13 -0400 Subject: Migrates from queens to rocky For now we need to retain the ability to deploy odl-queens for CSIT. Change-Id: Idea550ff5e7aeb230aa93d3575de11e5e9656302 Signed-off-by: Tim Rozet --- config/deploy/common-patches.yaml | 15 +++++++++++++++ config/deploy/os-nosdn-calipso_queens-noha.yaml | 11 ----------- config/deploy/os-nosdn-calipso_rocky-noha.yaml | 11 +++++++++++ config/deploy/os-nosdn-queens-ha.yaml | 11 ----------- config/deploy/os-nosdn-queens-noha.yaml | 11 ----------- config/deploy/os-nosdn-rocky-ha.yaml | 11 +++++++++++ config/deploy/os-nosdn-rocky-noha.yaml | 11 +++++++++++ config/deploy/os-odl-bgpvpn_queens-ha.yaml | 13 ------------- config/deploy/os-odl-bgpvpn_queens-noha.yaml | 13 ------------- 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_queens-ha.yaml | 13 ------------- config/deploy/os-odl-sfc_queens-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-queens-ha.yaml | 17 ----------------- config/deploy/os-ovn-rocky-ha.yaml | 17 +++++++++++++++++ 19 files changed, 143 insertions(+), 102 deletions(-) delete mode 100644 config/deploy/os-nosdn-calipso_queens-noha.yaml create mode 100644 config/deploy/os-nosdn-calipso_rocky-noha.yaml delete mode 100644 config/deploy/os-nosdn-queens-ha.yaml delete mode 100644 config/deploy/os-nosdn-queens-noha.yaml create mode 100644 config/deploy/os-nosdn-rocky-ha.yaml create mode 100644 config/deploy/os-nosdn-rocky-noha.yaml delete mode 100644 config/deploy/os-odl-bgpvpn_queens-ha.yaml delete mode 100644 config/deploy/os-odl-bgpvpn_queens-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 delete mode 100644 config/deploy/os-odl-sfc_queens-ha.yaml delete mode 100644 config/deploy/os-odl-sfc_queens-noha.yaml create mode 100644 config/deploy/os-odl-sfc_rocky-ha.yaml create mode 100644 config/deploy/os-odl-sfc_rocky-noha.yaml delete mode 100644 config/deploy/os-ovn-queens-ha.yaml create mode 100644 config/deploy/os-ovn-rocky-ha.yaml (limited to 'config/deploy') diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml index ac006bdd..d408a161 100644 --- a/config/deploy/common-patches.yaml +++ b/config/deploy/common-patches.yaml @@ -11,6 +11,21 @@ patches: project: openstack/puppet-tripleo - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 project: openstack/puppet-tripleo + rocky: + undercloud: + - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 + project: openstack/tripleo-common + branch: master + - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395 + project: openstack/tripleo-common + branch: master + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + branch: master + - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 + project: openstack/puppet-tripleo + branch: master queens: undercloud: - change-id: I966bf7f6f8d1cbc656abfad59e8bb927e1aa53c2 diff --git a/config/deploy/os-nosdn-calipso_queens-noha.yaml b/config/deploy/os-nosdn-calipso_queens-noha.yaml deleted file mode 100644 index 48d93f49..00000000 --- a/config/deploy/os-nosdn-calipso_queens-noha.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -global_params: - ha_enabled: false - -deploy_options: - containers: true - os_version: queens - sdn_controller: false - sfc: false - vpn: false - calipso: true 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-queens-ha.yaml b/config/deploy/os-nosdn-queens-ha.yaml deleted file mode 100644 index 88a40042..00000000 --- a/config/deploy/os-nosdn-queens-ha.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -global_params: - ha_enabled: true -deploy_options: - containers: true - os_version: queens - sdn_controller: false - tacker: false - congress: false - sfc: false - vpn: false diff --git a/config/deploy/os-nosdn-queens-noha.yaml b/config/deploy/os-nosdn-queens-noha.yaml deleted file mode 100644 index efadc31e..00000000 --- a/config/deploy/os-nosdn-queens-noha.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -global_params: - ha_enabled: false -deploy_options: - containers: true - os_version: queens - sdn_controller: false - tacker: false - congress: false - sfc: false - vpn: 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_queens-ha.yaml b/config/deploy/os-odl-bgpvpn_queens-ha.yaml deleted file mode 100644 index 27a0caf6..00000000 --- a/config/deploy/os-odl-bgpvpn_queens-ha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -global_params: - ha_enabled: true - -deploy_options: - containers: true - os_version: queens - sdn_controller: opendaylight - odl_version: master - tacker: false - congress: false - sfc: false - vpn: true diff --git a/config/deploy/os-odl-bgpvpn_queens-noha.yaml b/config/deploy/os-odl-bgpvpn_queens-noha.yaml deleted file mode 100644 index 33382307..00000000 --- a/config/deploy/os-odl-bgpvpn_queens-noha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -global_params: - ha_enabled: false - -deploy_options: - containers: true - os_version: queens - sdn_controller: opendaylight - odl_version: master - tacker: false - congress: false - sfc: false - vpn: true 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_queens-ha.yaml b/config/deploy/os-odl-sfc_queens-ha.yaml deleted file mode 100644 index 0cd01466..00000000 --- a/config/deploy/os-odl-sfc_queens-ha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -global_params: - ha_enabled: true - -deploy_options: - containers: true - os_version: queens - sdn_controller: opendaylight - odl_version: master - tacker: false - congress: false - sfc: true - vpn: false diff --git a/config/deploy/os-odl-sfc_queens-noha.yaml b/config/deploy/os-odl-sfc_queens-noha.yaml deleted file mode 100644 index d091b8cf..00000000 --- a/config/deploy/os-odl-sfc_queens-noha.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -global_params: - ha_enabled: false - -deploy_options: - containers: true - os_version: queens - sdn_controller: opendaylight - odl_version: master - tacker: false - congress: false - sfc: true - 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-queens-ha.yaml b/config/deploy/os-ovn-queens-ha.yaml deleted file mode 100644 index fe79068d..00000000 --- a/config/deploy/os-ovn-queens-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: queens - sdn_controller: ovn - tacker: false - congress: false - sfc: false - vpn: 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