diff options
Diffstat (limited to 'config/deploy')
25 files changed, 206 insertions, 35 deletions
diff --git a/config/deploy/common-patches.yaml b/config/deploy/common-patches.yaml new file mode 100644 index 00000000..bac6812c --- /dev/null +++ b/config/deploy/common-patches.yaml @@ -0,0 +1,45 @@ +--- +patches: + master: + undercloud: + - change-id: I2e0a40d7902f592e4b7bd727f57048111e0bea36 + project: openstack/tripleo-common + - change-id: Iaa2276aadae351fbc138de258c51d786f69e4395 + project: openstack/tripleo-common + - change-id: I8d1db69d520da069099f919f286e6a553dd645a5 + project: openstack/tripleo-heat-templates + - change-id: Ia51a825d11bd9b94d0110f13cdf2a6bbcedf6194 + project: openstack/tripleo-common + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + 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 + - change-id: I8d1db69d520da069099f919f286e6a553dd645a5 + project: openstack/tripleo-heat-templates + - change-id: Ia51a825d11bd9b94d0110f13cdf2a6bbcedf6194 + project: openstack/tripleo-common + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + branch: master + - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 + project: openstack/puppet-tripleo + branch: master + queens: + undercloud: + - change-id: I966bf7f6f8d1cbc656abfad59e8bb927e1aa53c2 + project: openstack/tripleo-common + overcloud: + - change-id: Ie988ba6a2d444a614e97c0edf5fce24b23970310 + project: openstack/puppet-tripleo + - change-id: I93e3d355625508fdc42f44bdd358f3ba86fbd8d7 + project: openstack/puppet-tripleo diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml index b8f01006..caef2628 100644 --- a/config/deploy/deploy_settings.yaml +++ b/config/deploy/deploy_settings.yaml @@ -108,3 +108,8 @@ deploy_options: # Set dovetail option to install dovetail # dovetail: false + + # Whether the nodes are deployed as openstack, kubernetes or openshift nodes + # Defaults to openstack. + # Possible values are openstack, k8s, openshift + vim: 'openstack' diff --git a/config/deploy/k8s-nosdn-nofeature-noha.yaml b/config/deploy/k8s-nosdn-nofeature-noha.yaml new file mode 100644 index 00000000..33a9b41a --- /dev/null +++ b/config/deploy/k8s-nosdn-nofeature-noha.yaml @@ -0,0 +1,16 @@ +--- +global_params: + ha_enabled: false + patches: + undercloud: + - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 + project: openstack/tripleo-heat-templates + +deploy_options: + sdn_controller: false + tacker: false + congress: false + sfc: false + vpn: false + ceph: false + vim: 'k8s' diff --git a/config/deploy/os-nosdn-calipso-noha.yaml b/config/deploy/os-nosdn-calipso-noha.yaml index ce5c8a5e..6502bcb0 100644 --- a/config/deploy/os-nosdn-calipso-noha.yaml +++ b/config/deploy/os-nosdn-calipso-noha.yaml @@ -3,6 +3,7 @@ global_params: ha_enabled: false deploy_options: + containers: true sdn_controller: false sfc: false vpn: false diff --git a/config/deploy/os-ovn-nofeature-noha.yaml b/config/deploy/os-nosdn-calipso_rocky-noha.yaml index 8c8c5f97..b14ceed5 100644 --- a/config/deploy/os-ovn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-calipso_rocky-noha.yaml @@ -3,8 +3,9 @@ global_params: ha_enabled: false deploy_options: - sdn_controller: ovn - tacker: false - congress: true + 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 13bf6d89..d896a672 100644 --- a/config/deploy/os-nosdn-nofeature-ha.yaml +++ b/config/deploy/os-nosdn-nofeature-ha.yaml @@ -1,10 +1,7 @@ --- global_params: ha_enabled: true - patches: - undercloud: - - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 - project: openstack/tripleo-heat-templates + deploy_options: containers: true os_version: master diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml index 0b1aaa04..0725031f 100644 --- a/config/deploy/os-nosdn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-nofeature-noha.yaml @@ -1,10 +1,7 @@ --- global_params: ha_enabled: false - patches: - undercloud: - - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 - project: openstack/tripleo-heat-templates + deploy_options: containers: true os_version: master diff --git a/config/deploy/os-nosdn-queens-ha.yaml b/config/deploy/os-nosdn-rocky-ha.yaml index 88a40042..152a8840 100644 --- a/config/deploy/os-nosdn-queens-ha.yaml +++ b/config/deploy/os-nosdn-rocky-ha.yaml @@ -3,7 +3,7 @@ global_params: ha_enabled: true deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: false tacker: false congress: false diff --git a/config/deploy/os-nosdn-queens-noha.yaml b/config/deploy/os-nosdn-rocky-noha.yaml index efadc31e..5fecfb6d 100644 --- a/config/deploy/os-nosdn-queens-noha.yaml +++ b/config/deploy/os-nosdn-rocky-noha.yaml @@ -3,7 +3,7 @@ global_params: ha_enabled: false deploy_options: containers: true - os_version: queens + os_version: rocky sdn_controller: false tacker: false congress: false diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml index 68b62734..f61e1a60 100644 --- a/config/deploy/os-odl-bgpvpn-ha.yaml +++ b/config/deploy/os-odl-bgpvpn-ha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: true deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen + odl_version: master tacker: false - congress: true + congress: false sfc: false vpn: true diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml index 0435e6b5..4bf90aa7 100644 --- a/config/deploy/os-odl-bgpvpn-noha.yaml +++ b/config/deploy/os-odl-bgpvpn-noha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: false deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen + odl_version: master tacker: false - congress: true + 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-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml index 313cb1f4..748da3c7 100644 --- a/config/deploy/os-odl-nofeature-ha.yaml +++ b/config/deploy/os-odl-nofeature-ha.yaml @@ -1,10 +1,7 @@ --- global_params: ha_enabled: true - patches: - undercloud: - - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 - project: openstack/tripleo-heat-templates + deploy_options: containers: true os_version: master diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml index e2b34642..0767822b 100644 --- a/config/deploy/os-odl-nofeature-noha.yaml +++ b/config/deploy/os-odl-nofeature-noha.yaml @@ -1,10 +1,6 @@ --- global_params: ha_enabled: false - patches: - undercloud: - - change-id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6 - project: openstack/tripleo-heat-templates deploy_options: containers: true diff --git a/config/deploy/os-odl-queens-ha.yaml b/config/deploy/os-odl-queens-ha.yaml index 62a12d2b..9738be38 100644 --- a/config/deploy/os-odl-queens-ha.yaml +++ b/config/deploy/os-odl-queens-ha.yaml @@ -1,6 +1,7 @@ --- global_params: ha_enabled: true + deploy_options: containers: true os_version: queens diff --git a/config/deploy/os-odl-queens-noha.yaml b/config/deploy/os-odl-queens-noha.yaml index 75a7346c..0500eec1 100644 --- a/config/deploy/os-odl-queens-noha.yaml +++ b/config/deploy/os-odl-queens-noha.yaml @@ -1,10 +1,7 @@ --- global_params: ha_enabled: false - patches: - undercloud: - - change-id: Ie380cc41ca50a294a2647d673f339d02111bf6b3 - project: openstack/tripleo-heat-templates + deploy_options: containers: true os_version: queens 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-ha.yaml b/config/deploy/os-odl-sfc-ha.yaml index 3a87bfe3..e8df1170 100644 --- a/config/deploy/os-odl-sfc-ha.yaml +++ b/config/deploy/os-odl-sfc-ha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: true deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen - tacker: true - congress: true + odl_version: master + tacker: false + congress: false sfc: true vpn: false diff --git a/config/deploy/os-odl-sfc-noha.yaml b/config/deploy/os-odl-sfc-noha.yaml index 2b08af6c..3dac36fa 100644 --- a/config/deploy/os-odl-sfc-noha.yaml +++ b/config/deploy/os-odl-sfc-noha.yaml @@ -3,9 +3,11 @@ global_params: ha_enabled: false deploy_options: + containers: true + os_version: master sdn_controller: opendaylight - odl_version: nitrogen - tacker: true - congress: true + 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-nofeature-ha.yaml b/config/deploy/os-ovn-nofeature-ha.yaml new file mode 100644 index 00000000..6c42cad9 --- /dev/null +++ b/config/deploy/os-ovn-nofeature-ha.yaml @@ -0,0 +1,15 @@ +--- +global_params: + ha_enabled: true + patches: + undercloud: + - change-id: Ic08ff58b10d4fa7116163be1f7fce57879cee8c5 + project: openstack/tripleo-common + +deploy_options: + containers: true + 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 |