From 3ac3caa0138d44aa6031848d5b83802128a169b5 Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Thu, 29 Jul 2021 21:18:24 -0600 Subject: [PATCH] Add support for Victoria and Wallaby Defines compute kit and cinder jobs for new releases with corresponding values overrides. Disables compute agent list test for Wallaby since related API is removed [0]. Since Wallaby with switch of osc to sdk '--id auto' is no longer treated specially in 'openstack flavor create'. The same behavior can be achieved w/o specifying --id flag for flavor creation [1]. Starting Wallaby 'nova-manage api_db version' returns init version for empty database greater than 0 [2]. _db-sync.sh.tpl logic prior to this commit does not work due to this. We need to either remove (done in current commit) or justify and alter previous logic. [0] https://review.opendev.org/749309 [1] https://review.opendev.org/750151 [2] https://opendev.org/openstack/nova/src/branch/stable/wallaby/nova/db/sqlalchemy/migration.py#L32 Change-Id: I361431d9aa8c1a06c5d59f479fb161ecd87e2ee2 Signed-off-by: Andrii Ostapenko --- barbican/Chart.yaml | 2 +- .../victoria-ubuntu_focal.yaml | 13 +++++++ .../wallaby-ubuntu_focal.yaml | 13 +++++++ cinder/Chart.yaml | 2 +- .../victoria-ubuntu_focal.yaml | 18 ++++++++++ .../wallaby-ubuntu_focal.yaml | 18 ++++++++++ glance/Chart.yaml | 2 +- .../victoria-ubuntu_focal.yaml | 15 ++++++++ .../wallaby-ubuntu_focal.yaml | 15 ++++++++ heat/Chart.yaml | 2 +- .../victoria-ubuntu_focal.yaml | 17 +++++++++ .../wallaby-ubuntu_focal.yaml | 17 +++++++++ horizon/Chart.yaml | 2 +- .../victoria-ubuntu_focal.yaml | 8 +++++ .../wallaby-ubuntu_focal.yaml | 8 +++++ keystone/Chart.yaml | 2 +- .../victoria-ubuntu_focal.yaml | 16 +++++++++ .../wallaby-ubuntu_focal.yaml | 16 +++++++++ neutron/Chart.yaml | 2 +- .../victoria-ubuntu_focal.yaml | 20 +++++++++++ .../wallaby-ubuntu_focal.yaml | 20 +++++++++++ nova/Chart.yaml | 2 +- nova/templates/bin/_bootstrap.sh.tpl | 6 ++++ nova/templates/bin/_db-sync.sh.tpl | 14 +++----- nova/values.yaml | 5 --- .../victoria-ubuntu_focal.yaml | 24 +++++++++++++ nova/values_overrides/victoria.yaml | 20 +++++++++++ .../wallaby-ubuntu_focal.yaml | 24 +++++++++++++ nova/values_overrides/wallaby.yaml | 25 +++++++++++++ placement/Chart.yaml | 2 +- .../victoria-ubuntu_focal.yaml | 23 ++++++++++++ .../wallaby-ubuntu_focal.yaml | 23 ++++++++++++ releasenotes/notes/barbican.yaml | 1 + releasenotes/notes/cinder.yaml | 1 + releasenotes/notes/glance.yaml | 1 + releasenotes/notes/heat.yaml | 1 + releasenotes/notes/horizon.yaml | 1 + releasenotes/notes/keystone.yaml | 1 + releasenotes/notes/neutron.yaml | 1 + releasenotes/notes/nova.yaml | 1 + releasenotes/notes/placement.yaml | 1 + tools/deployment/common/setup-client.sh | 1 + zuul.d/jobs-openstack-helm.yaml | 36 +++++++++++++++++++ 43 files changed, 419 insertions(+), 23 deletions(-) create mode 100644 barbican/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 barbican/values_overrides/wallaby-ubuntu_focal.yaml create mode 100644 cinder/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 cinder/values_overrides/wallaby-ubuntu_focal.yaml create mode 100644 glance/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 glance/values_overrides/wallaby-ubuntu_focal.yaml create mode 100644 heat/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 heat/values_overrides/wallaby-ubuntu_focal.yaml create mode 100644 horizon/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 horizon/values_overrides/wallaby-ubuntu_focal.yaml create mode 100644 keystone/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 keystone/values_overrides/wallaby-ubuntu_focal.yaml create mode 100644 neutron/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 neutron/values_overrides/wallaby-ubuntu_focal.yaml create mode 100644 nova/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 nova/values_overrides/victoria.yaml create mode 100644 nova/values_overrides/wallaby-ubuntu_focal.yaml create mode 100644 nova/values_overrides/wallaby.yaml create mode 100644 placement/values_overrides/victoria-ubuntu_focal.yaml create mode 100644 placement/values_overrides/wallaby-ubuntu_focal.yaml diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml index b37885ec82..f406dc7af8 100644 --- a/barbican/Chart.yaml +++ b/barbican/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Barbican name: barbican -version: 0.2.4 +version: 0.2.5 home: https://docs.openstack.org/barbican/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png sources: diff --git a/barbican/values_overrides/victoria-ubuntu_focal.yaml b/barbican/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..0e89b004a0 --- /dev/null +++ b/barbican/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,13 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + scripted_test: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + barbican_db_sync: "docker.io/openstackhelm/barbican:victoria-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + barbican_api: "docker.io/openstackhelm/barbican:victoria-ubuntu_focal" +... diff --git a/barbican/values_overrides/wallaby-ubuntu_focal.yaml b/barbican/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..4d9dc9fd7e --- /dev/null +++ b/barbican/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,13 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + scripted_test: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + barbican_db_sync: "docker.io/openstackhelm/barbican:wallaby-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + barbican_api: "docker.io/openstackhelm/barbican:wallaby-ubuntu_focal" +... diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml index ee831cad61..208f5f6f09 100644 --- a/cinder/Chart.yaml +++ b/cinder/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Cinder name: cinder -version: 0.2.6 +version: 0.2.7 home: https://docs.openstack.org/cinder/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png sources: diff --git a/cinder/values_overrides/victoria-ubuntu_focal.yaml b/cinder/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..6cdf86389f --- /dev/null +++ b/cinder/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,18 @@ +--- +images: + tags: + db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + cinder_db_sync: "docker.io/openstackhelm/cinder:victoria-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + cinder_api: "docker.io/openstackhelm/cinder:victoria-ubuntu_focal" + bootstrap: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + cinder_scheduler: "docker.io/openstackhelm/cinder:victoria-ubuntu_focal" + cinder_volume: "docker.io/openstackhelm/cinder:victoria-ubuntu_focal" + cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:victoria-ubuntu_focal" + cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic" + cinder_backup: "docker.io/openstackhelm/cinder:victoria-ubuntu_focal" + cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic" +... diff --git a/cinder/values_overrides/wallaby-ubuntu_focal.yaml b/cinder/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..9e5269d582 --- /dev/null +++ b/cinder/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,18 @@ +--- +images: + tags: + db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + cinder_db_sync: "docker.io/openstackhelm/cinder:wallaby-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + cinder_api: "docker.io/openstackhelm/cinder:wallaby-ubuntu_focal" + bootstrap: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + cinder_scheduler: "docker.io/openstackhelm/cinder:wallaby-ubuntu_focal" + cinder_volume: "docker.io/openstackhelm/cinder:wallaby-ubuntu_focal" + cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:wallaby-ubuntu_focal" + cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic" + cinder_backup: "docker.io/openstackhelm/cinder:wallaby-ubuntu_focal" + cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic" +... diff --git a/glance/Chart.yaml b/glance/Chart.yaml index 3d6d0b79a5..cd561f422e 100644 --- a/glance/Chart.yaml +++ b/glance/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Glance name: glance -version: 0.2.5 +version: 0.2.6 home: https://docs.openstack.org/glance/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png sources: diff --git a/glance/values_overrides/victoria-ubuntu_focal.yaml b/glance/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..f2d0526fe1 --- /dev/null +++ b/glance/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,15 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + glance_db_sync: "docker.io/openstackhelm/glance:victoria-ubuntu_focal" + glance_api: "docker.io/openstackhelm/glance:victoria-ubuntu_focal" + glance_registry: "docker.io/openstackhelm/glance:victoria-ubuntu_focal" + glance_metadefs_load: "docker.io/openstackhelm/glance:victoria-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic" +... diff --git a/glance/values_overrides/wallaby-ubuntu_focal.yaml b/glance/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..73c0b2c2ac --- /dev/null +++ b/glance/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,15 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + glance_db_sync: "docker.io/openstackhelm/glance:wallaby-ubuntu_focal" + glance_api: "docker.io/openstackhelm/glance:wallaby-ubuntu_focal" + glance_registry: "docker.io/openstackhelm/glance:wallaby-ubuntu_focal" + glance_metadefs_load: "docker.io/openstackhelm/glance:wallaby-ubuntu_focal" + glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic" +... diff --git a/heat/Chart.yaml b/heat/Chart.yaml index c721c8c57f..39d01dd515 100644 --- a/heat/Chart.yaml +++ b/heat/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Heat name: heat -version: 0.2.4 +version: 0.2.5 home: https://docs.openstack.org/heat/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png sources: diff --git a/heat/values_overrides/victoria-ubuntu_focal.yaml b/heat/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..a2b2627f0d --- /dev/null +++ b/heat/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,17 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + heat_db_sync: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + heat_api: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + heat_cfn: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + heat_cloudwatch: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + heat_engine: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + heat_engine_cleaner: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + heat_purge_deleted: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" +... diff --git a/heat/values_overrides/wallaby-ubuntu_focal.yaml b/heat/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..0fef1c2c7b --- /dev/null +++ b/heat/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,17 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + heat_db_sync: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + heat_api: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + heat_cfn: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + heat_cloudwatch: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + heat_engine: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + heat_engine_cleaner: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + heat_purge_deleted: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" +... diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml index 07d54bf898..4712548bca 100644 --- a/horizon/Chart.yaml +++ b/horizon/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Horizon name: horizon -version: 0.2.5 +version: 0.2.6 home: https://docs.openstack.org/horizon/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png sources: diff --git a/horizon/values_overrides/victoria-ubuntu_focal.yaml b/horizon/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..33bde90091 --- /dev/null +++ b/horizon/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,8 @@ +--- +images: + tags: + db_init: docker.io/openstackhelm/heat:victoria-ubuntu_focal + db_drop: docker.io/openstackhelm/heat:victoria-ubuntu_focal + horizon_db_sync: docker.io/openstackhelm/horizon:victoria-ubuntu_focal + horizon: docker.io/openstackhelm/horizon:victoria-ubuntu_focal +... diff --git a/horizon/values_overrides/wallaby-ubuntu_focal.yaml b/horizon/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..1653cc48d9 --- /dev/null +++ b/horizon/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,8 @@ +--- +images: + tags: + db_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal + db_drop: docker.io/openstackhelm/heat:wallaby-ubuntu_focal + horizon_db_sync: docker.io/openstackhelm/horizon:wallaby-ubuntu_focal + horizon: docker.io/openstackhelm/horizon:wallaby-ubuntu_focal +... diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml index 44eeb84245..95469b9605 100644 --- a/keystone/Chart.yaml +++ b/keystone/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Keystone name: keystone -version: 0.2.8 +version: 0.2.9 home: https://docs.openstack.org/keystone/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png sources: diff --git a/keystone/values_overrides/victoria-ubuntu_focal.yaml b/keystone/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..0a913b75cc --- /dev/null +++ b/keystone/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,16 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + keystone_api: "docker.io/openstackhelm/keystone:victoria-ubuntu_focal" + keystone_bootstrap: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + keystone_credential_rotate: "docker.io/openstackhelm/keystone:victoria-ubuntu_focal" + keystone_credential_setup: "docker.io/openstackhelm/keystone:victoria-ubuntu_focal" + keystone_db_sync: "docker.io/openstackhelm/keystone:victoria-ubuntu_focal" + keystone_domain_manage: "docker.io/openstackhelm/keystone:victoria-ubuntu_focal" + keystone_fernet_rotate: "docker.io/openstackhelm/keystone:victoria-ubuntu_focal" + keystone_fernet_setup: "docker.io/openstackhelm/keystone:victoria-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" +... diff --git a/keystone/values_overrides/wallaby-ubuntu_focal.yaml b/keystone/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..106894abfc --- /dev/null +++ b/keystone/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,16 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + keystone_api: "docker.io/openstackhelm/keystone:wallaby-ubuntu_focal" + keystone_bootstrap: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + keystone_credential_rotate: "docker.io/openstackhelm/keystone:wallaby-ubuntu_focal" + keystone_credential_setup: "docker.io/openstackhelm/keystone:wallaby-ubuntu_focal" + keystone_db_sync: "docker.io/openstackhelm/keystone:wallaby-ubuntu_focal" + keystone_domain_manage: "docker.io/openstackhelm/keystone:wallaby-ubuntu_focal" + keystone_fernet_rotate: "docker.io/openstackhelm/keystone:wallaby-ubuntu_focal" + keystone_fernet_setup: "docker.io/openstackhelm/keystone:wallaby-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" +... diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index 25db8ba053..5d68cf2cd4 100644 --- a/neutron/Chart.yaml +++ b/neutron/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Neutron name: neutron -version: 0.2.7 +version: 0.2.8 home: https://docs.openstack.org/neutron/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png sources: diff --git a/neutron/values_overrides/victoria-ubuntu_focal.yaml b/neutron/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..f5e887389b --- /dev/null +++ b/neutron/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,20 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + neutron_db_sync: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_dhcp: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_l3: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_l2gw: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_metadata: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_server: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_rpc_server: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" + neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:victoria-ubuntu_focal" +... diff --git a/neutron/values_overrides/wallaby-ubuntu_focal.yaml b/neutron/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..c47b853c7b --- /dev/null +++ b/neutron/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,20 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + neutron_db_sync: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_dhcp: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_l3: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_l2gw: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_metadata: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_server: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_rpc_server: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" + neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:wallaby-ubuntu_focal" +... diff --git a/nova/Chart.yaml b/nova/Chart.yaml index b9ffc4ca51..16d7a12e72 100644 --- a/nova/Chart.yaml +++ b/nova/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Nova name: nova -version: 0.2.10 +version: 0.2.11 home: https://docs.openstack.org/nova/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png sources: diff --git a/nova/templates/bin/_bootstrap.sh.tpl b/nova/templates/bin/_bootstrap.sh.tpl index 33ce89a9ff..4d69c097e2 100644 --- a/nova/templates/bin/_bootstrap.sh.tpl +++ b/nova/templates/bin/_bootstrap.sh.tpl @@ -19,9 +19,15 @@ export HOME=/tmp {{ if .Values.bootstrap.structured.flavors.enabled }} {{ range .Values.bootstrap.structured.flavors.options }} +# NOTE(aostapenko) Since Wallaby with switch of osc to sdk '--id auto' is no +# longer treated specially. Though the same behavior can be achieved w/o specifying +#--id flag. +# https://review.opendev.org/c/openstack/python-openstackclient/+/750151 openstack flavor show {{ .name }} || \ openstack flavor create {{ .name }} \ +{{ if .id }} \ --id {{ .id }} \ +{{ end }} \ --ram {{ .ram }} \ --disk {{ .disk }} \ --vcpus {{ .vcpus }} diff --git a/nova/templates/bin/_db-sync.sh.tpl b/nova/templates/bin/_db-sync.sh.tpl index fdcb92ed87..e68823801c 100644 --- a/nova/templates/bin/_db-sync.sh.tpl +++ b/nova/templates/bin/_db-sync.sh.tpl @@ -55,15 +55,11 @@ function manage_cells () { fi } -# NOTE(portdirect): if the db has been populated we should setup cells if -# required, otherwise we should poulate the api db, and then setup cells. -if [ "$(nova-manage api_db version)" -gt "0" ]; then - manage_cells - nova-manage api_db sync -else - nova-manage api_db sync - manage_cells -fi +# NOTE(aostapenko) Starting Wallaby nova-manage api_db version returns init version for empty database +# greater than 0 # https://opendev.org/openstack/nova/src/branch/stable/wallaby/nova/db/sqlalchemy/migration.py#L32 +# thus logic prior to this commit does not work. We need to either remove or justify and alter previous logic. +nova-manage api_db sync +manage_cells nova-manage db sync diff --git a/nova/values.yaml b/nova/values.yaml index e3f95311dc..29366dfeee 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -128,31 +128,26 @@ bootstrap: options: m1_tiny: name: "m1.tiny" - id: "auto" ram: 512 disk: 1 vcpus: 1 m1_small: name: "m1.small" - id: "auto" ram: 2048 disk: 20 vcpus: 1 m1_medium: name: "m1.medium" - id: "auto" ram: 4096 disk: 40 vcpus: 2 m1_large: name: "m1.large" - id: "auto" ram: 8192 disk: 80 vcpus: 4 m1_xlarge: name: "m1.xlarge" - id: "auto" ram: 16384 disk: 160 vcpus: 8 diff --git a/nova/values_overrides/victoria-ubuntu_focal.yaml b/nova/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..3cfd4781f0 --- /dev/null +++ b/nova/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,24 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + nova_api: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_cell_setup: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_cell_setup_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + nova_compute: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_compute_ssh: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_conductor: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_db_sync: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_novncproxy: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_novncproxy_assets: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_placement: "docker.io/openstackhelm/placement:master-ubuntu_bionic-20200207" + nova_scheduler: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_spiceproxy: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_spiceproxy_assets: "docker.io/openstackhelm/nova:victoria-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic" +... diff --git a/nova/values_overrides/victoria.yaml b/nova/values_overrides/victoria.yaml new file mode 100644 index 0000000000..7d3ae3937c --- /dev/null +++ b/nova/values_overrides/victoria.yaml @@ -0,0 +1,20 @@ +--- +manifests: + # NOTE(lamt): The nova-consoleauth service has been removed. It was + # deprecated since the 18.0.0 (Rocky) release. + # See: https://docs.openstack.org/releasenotes/nova/train.html + deployment_consoleauth: false + # NOTE(lamt): Placement code was extracted from nova post Stein. + # A placement chart will need to be deployed to replace. + # See: https://docs.openstack.org/releasenotes/nova/train.html + deployment_placement: false + ingress_placement: false + job_db_init_placement: false + job_ks_placement_endpoints: false + job_ks_placement_service: false + job_ks_placement_user: false + pdb_placement: false + secret_keystone_placement: false + service_ingress_placement: false + service_placement: false +... diff --git a/nova/values_overrides/wallaby-ubuntu_focal.yaml b/nova/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..be76cfd4ee --- /dev/null +++ b/nova/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,24 @@ +--- +images: + tags: + bootstrap: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + nova_api: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_cell_setup: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_cell_setup_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + nova_compute: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_compute_ssh: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_conductor: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_db_sync: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_novncproxy: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_novncproxy_assets: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_placement: "docker.io/openstackhelm/placement:master-ubuntu_bionic-20200207" + nova_scheduler: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_spiceproxy: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_spiceproxy_assets: "docker.io/openstackhelm/nova:wallaby-ubuntu_focal" + nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic" +... diff --git a/nova/values_overrides/wallaby.yaml b/nova/values_overrides/wallaby.yaml new file mode 100644 index 0000000000..e52300ddd4 --- /dev/null +++ b/nova/values_overrides/wallaby.yaml @@ -0,0 +1,25 @@ +--- +manifests: + # NOTE(lamt): The nova-consoleauth service has been removed. It was + # deprecated since the 18.0.0 (Rocky) release. + # See: https://docs.openstack.org/releasenotes/nova/train.html + deployment_consoleauth: false + # NOTE(lamt): Placement code was extracted from nova post Stein. + # A placement chart will need to be deployed to replace. + # See: https://docs.openstack.org/releasenotes/nova/train.html + deployment_placement: false + ingress_placement: false + job_db_init_placement: false + job_ks_placement_endpoints: false + job_ks_placement_service: false + job_ks_placement_user: false + pdb_placement: false + secret_keystone_placement: false + service_ingress_placement: false + service_placement: false + +conf: + rally_tests: + tests: + NovaAgents.list_agents: [] +... diff --git a/placement/Chart.yaml b/placement/Chart.yaml index d0ee9f288e..ca7c2ee59d 100644 --- a/placement/Chart.yaml +++ b/placement/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Placement name: placement -version: 0.2.1 +version: 0.2.2 home: https://docs.openstack.org/placement/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png sources: diff --git a/placement/values_overrides/victoria-ubuntu_focal.yaml b/placement/values_overrides/victoria-ubuntu_focal.yaml new file mode 100644 index 0000000000..1c94633401 --- /dev/null +++ b/placement/values_overrides/victoria-ubuntu_focal.yaml @@ -0,0 +1,23 @@ +--- +images: + pull_policy: IfNotPresent + tags: + placement: "docker.io/openstackhelm/placement:victoria-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:victoria-ubuntu_focal" + db_migrate: "quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic" + placement_db_sync: "docker.io/openstackhelm/placement:victoria-ubuntu_focal" + dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0" + image_repo_sync: "docker.io/docker:17.07.0" +manifests: + job_db_migrate: true +dependencies: + static: + db_sync: + jobs: + - placement-db-init + - placement-db-migrate +... diff --git a/placement/values_overrides/wallaby-ubuntu_focal.yaml b/placement/values_overrides/wallaby-ubuntu_focal.yaml new file mode 100644 index 0000000000..9122f5bb92 --- /dev/null +++ b/placement/values_overrides/wallaby-ubuntu_focal.yaml @@ -0,0 +1,23 @@ +--- +images: + pull_policy: IfNotPresent + tags: + placement: "docker.io/openstackhelm/placement:wallaby-ubuntu_focal" + ks_user: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_service: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + ks_endpoints: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_init: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_drop: "docker.io/openstackhelm/heat:wallaby-ubuntu_focal" + db_migrate: "quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic" + placement_db_sync: "docker.io/openstackhelm/placement:wallaby-ubuntu_focal" + dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0" + image_repo_sync: "docker.io/docker:17.07.0" +manifests: + job_db_migrate: true +dependencies: + static: + db_sync: + jobs: + - placement-db-init + - placement-db-migrate +... diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml index 0b5959f912..a9f7340e66 100644 --- a/releasenotes/notes/barbican.yaml +++ b/releasenotes/notes/barbican.yaml @@ -8,4 +8,5 @@ barbican: - 0.2.2 Add helm hook conditional - 0.2.3 Add support for master kek rotation - 0.2.4 Add Ussuri release support + - 0.2.5 Add Victoria and Wallaby releases support ... diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml index 451541707c..dd5c2e900e 100644 --- a/releasenotes/notes/cinder.yaml +++ b/releasenotes/notes/cinder.yaml @@ -23,4 +23,5 @@ cinder: - 0.2.4 Add Ussuri release support - 0.2.5 Add volume QoS support - 0.2.6 Added helm.sh/hook with value of post-install and post-upgrade + - 0.2.7 Add Victoria and Wallaby releases support ... diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml index 4b8ab4c663..8d618f68b0 100644 --- a/releasenotes/notes/glance.yaml +++ b/releasenotes/notes/glance.yaml @@ -15,4 +15,5 @@ glance: - 0.2.3 Use policies in yaml format - 0.2.4 Mount rabbitmq TLS secret - 0.2.5 Add Ussuri release support + - 0.2.6 Add Victoria and Wallaby releases support ... diff --git a/releasenotes/notes/heat.yaml b/releasenotes/notes/heat.yaml index e050cf81b0..b879a5f388 100644 --- a/releasenotes/notes/heat.yaml +++ b/releasenotes/notes/heat.yaml @@ -11,4 +11,5 @@ heat: - 0.2.2 Use policies in yaml format - 0.2.3 Mount rabbitmq TLS secret - 0.2.4 Add Ussuri release support + - 0.2.5 Add Victoria and Wallaby releases support ... diff --git a/releasenotes/notes/horizon.yaml b/releasenotes/notes/horizon.yaml index 99e73222f7..253347ac2e 100644 --- a/releasenotes/notes/horizon.yaml +++ b/releasenotes/notes/horizon.yaml @@ -15,4 +15,5 @@ horizon: - 0.2.3 Add openstack_enable_password_retrieve variable in value - 0.2.4 Fix OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT value - 0.2.5 Add Ussuri release support + - 0.2.6 Add Victoria and Wallaby releases support ... diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml index 9478abc0fc..7ea61842fb 100644 --- a/releasenotes/notes/keystone.yaml +++ b/releasenotes/notes/keystone.yaml @@ -24,4 +24,5 @@ keystone: - 0.2.6 Modify default probe timings - 0.2.7 Add Ussuri release support - 0.2.8 Remove member bootstrap logic + - 0.2.9 Add Victoria and Wallaby releases support ... diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml index d62a665c93..968825ec78 100644 --- a/releasenotes/notes/neutron.yaml +++ b/releasenotes/notes/neutron.yaml @@ -21,4 +21,5 @@ neutron: - 0.2.5 Use rootwrap daemon - 0.2.6 Fix neutron agent-init script - 0.2.7 Made dnsmasq.conf overridable in configmap-bin + - 0.2.8 Add Victoria and Wallaby releases support ... diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml index 09c53cedf0..3ce9044521 100644 --- a/releasenotes/notes/nova.yaml +++ b/releasenotes/notes/nova.yaml @@ -31,4 +31,5 @@ nova: - 0.2.8 Fix the cron archive_deleted_rows bash script for before and max-rows values - 0.2.9 Add image clean up to rally test - 0.2.10 Add tls cert mounting to nova-novnc + - 0.2.11 Add Victoria and Wallaby releases support ... diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml index a83fd46e14..c46b5c9456 100644 --- a/releasenotes/notes/placement.yaml +++ b/releasenotes/notes/placement.yaml @@ -10,4 +10,5 @@ placement: - 0.1.7 Change Issuer to ClusterIssuer - 0.2.0 Remove support for releases before T - 0.2.1 Add Ussuri release support + - 0.2.2 Add Victoria and Wallaby releases support ... diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh index 65fe342b2d..1b229dda5d 100755 --- a/tools/deployment/common/setup-client.sh +++ b/tools/deployment/common/setup-client.sh @@ -14,6 +14,7 @@ set -xe +sudo -H -E pip3 install --upgrade pip sudo -H -E pip3 install \ -c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/${OPENSTACK_RELEASE:-stein}} \ cmd2 python-openstackclient python-heatclient --ignore-installed diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml index fe049491b1..2e3c2d0f7e 100644 --- a/zuul.d/jobs-openstack-helm.yaml +++ b/zuul.d/jobs-openstack-helm.yaml @@ -111,6 +111,24 @@ container_distro_name: ubuntu container_distro_version: bionic +- job: + name: openstack-helm-cinder-victoria-ubuntu_focal + parent: openstack-helm-cinder + vars: + osh_params: + openstack_release: victoria + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-cinder-wallaby-ubuntu_focal + parent: openstack-helm-cinder + vars: + osh_params: + openstack_release: wallaby + container_distro_name: ubuntu + container_distro_version: focal + - job: name: openstack-helm-compute-kit parent: openstack-helm-chart-deploy @@ -162,6 +180,24 @@ container_distro_name: ubuntu container_distro_version: bionic +- job: + name: openstack-helm-compute-kit-victoria-ubuntu_focal + parent: openstack-helm-compute-kit + vars: + osh_params: + openstack_release: victoria + container_distro_name: ubuntu + container_distro_version: focal + +- job: + name: openstack-helm-compute-kit-wallaby-ubuntu_focal + parent: openstack-helm-compute-kit + vars: + osh_params: + openstack_release: wallaby + container_distro_name: ubuntu + container_distro_version: focal + - job: name: openstack-helm-horizon-train-ubuntu_bionic parent: openstack-helm-chart-deploy