From 6e4ab4aa0cc3d6ef4b7b7ff315e4d746889ec965 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Thu, 17 Oct 2019 21:22:29 -0500 Subject: [PATCH] Update ceph-config-helper image This updates the ceph-config-helper image for the ubuntu distro based jobs to use an image that includes kubernetes 1.16.2 Change-Id: If063db5e6f0abfab10cd0195b3633c41d8ed560f Signed-off-by: Steve Wilkerson --- cinder/values.yaml | 4 ++-- doc/source/testing/ceph-upgrade.rst | 16 ++++++++-------- glance/values.yaml | 2 +- nova/values.yaml | 2 +- nova/values_overrides/pike-ubuntu_xenial.yaml | 2 +- nova/values_overrides/queens-ubuntu_xenial.yaml | 2 +- nova/values_overrides/rocky-opensuse_15.yaml | 2 +- nova/values_overrides/rocky-ubuntu_bionic.yaml | 2 +- nova/values_overrides/rocky-ubuntu_xenial.yaml | 2 +- nova/values_overrides/stein-ubuntu_bionic.yaml | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cinder/values.yaml b/cinder/values.yaml index a986f23ed9..1f86b4ba50 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -56,9 +56,9 @@ images: cinder_scheduler: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial cinder_volume: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial cinder_volume_usage_audit: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial - cinder_storage_init: docker.io/port/ceph-config-helper:v1.10.3 + cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial cinder_backup: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial - cinder_backup_storage_init: docker.io/port/ceph-config-helper:v1.10.3 + cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/doc/source/testing/ceph-upgrade.rst b/doc/source/testing/ceph-upgrade.rst index be4f2bfe6f..4e8d561aeb 100644 --- a/doc/source/testing/ceph-upgrade.rst +++ b/doc/source/testing/ceph-upgrade.rst @@ -74,9 +74,9 @@ Steps: images: tags: ceph_bootstrap: 'docker.io/ceph/daemon:master-0351083-luminous-ubuntu-16.04-x86_64' - ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3' - ceph_rbd_pool: 'docker.io/port/ceph-config-helper:v1.10.3' - ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.3' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' + ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' + ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' ceph_mon: 'docker.io/ceph/daemon:master-0351083-luminous-ubuntu-16.04-x86_64' ceph_osd: 'docker.io/ceph/daemon:master-0351083-luminous-ubuntu-16.04-x86_64' ceph_mds: 'docker.io/ceph/daemon:master-0351083-luminous-ubuntu-16.04-x86_64' @@ -215,7 +215,7 @@ Steps: Containers: ceph-mon: Container ID: docker://d5a3396f99704038ab8ef6bfe329013ed46472ebb8e26dddc140b621329f0f92 - Image: docker.io/port/ceph-config-helper:v1.10.3 + Image: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial 6) Install Openstack charts @@ -332,9 +332,9 @@ Update, image section in new overrides ``ceph-update.yaml`` as shown below images: tags: ceph_bootstrap: 'docker.io/ceph/daemon:master-0351083-luminous-ubuntu-16.04-x86_64' - ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3' - ceph_rbd_pool: 'docker.io/port/ceph-config-helper:v1.10.3' - ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.3' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' + ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' + ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' ceph_mon: 'docker.io/ceph/daemon:master-a8d20ed-luminous-ubuntu-16.04-x86_64' ceph_osd: 'docker.io/ceph/daemon:master-a8d20ed-luminous-ubuntu-16.04-x86_64' ceph_mds: 'docker.io/ceph/daemon:master-a8d20ed-luminous-ubuntu-16.04-x86_64' @@ -586,7 +586,7 @@ pods are running. No interruption to OSH pods. Containers: ceph-mon: Container ID: docker://d5a3396f99704038ab8ef6bfe329013ed46472ebb8e26dddc140b621329f0f92 - Image: docker.io/port/ceph-config-helper:v1.10.3 + Image: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial Conclusion: =========== diff --git a/glance/values.yaml b/glance/values.yaml index 171cb7aa20..9da9427b4e 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -39,7 +39,7 @@ release_group: null images: tags: test: docker.io/xrally/xrally-openstack:1.3.0 - glance_storage_init: docker.io/port/ceph-config-helper:v1.10.3 + glance_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial glance_metadefs_load: docker.io/openstackhelm/glance:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial glance_db_sync: docker.io/openstackhelm/glance:ocata-ubuntu_xenial diff --git a/nova/values.yaml b/nova/values.yaml index 124e4ca15d..a994148b5c 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -84,7 +84,7 @@ images: nova_scheduler: docker.io/openstackhelm/nova:ocata-ubuntu_xenial # NOTE(portdirect): we simply use the ceph config helper here, # as it has both oscli and jq. - nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' + nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' nova_spiceproxy: docker.io/openstackhelm/nova:ocata-ubuntu_xenial nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:ocata' test: docker.io/xrally/xrally-openstack:1.3.0 diff --git a/nova/values_overrides/pike-ubuntu_xenial.yaml b/nova/values_overrides/pike-ubuntu_xenial.yaml index e8f0b0c883..3d631f4e57 100644 --- a/nova/values_overrides/pike-ubuntu_xenial.yaml +++ b/nova/values_overrides/pike-ubuntu_xenial.yaml @@ -20,7 +20,7 @@ images: nova_novncproxy_assets: "docker.io/openstackhelm/nova:pike-ubuntu_xenial" nova_placement: "docker.io/openstackhelm/nova:pike-ubuntu_xenial" nova_scheduler: "docker.io/openstackhelm/nova:pike-ubuntu_xenial" - #nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' + #nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' nova_spiceproxy: "docker.io/openstackhelm/nova:pike-ubuntu_xenial" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:pike-ubuntu_xenial" nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial" diff --git a/nova/values_overrides/queens-ubuntu_xenial.yaml b/nova/values_overrides/queens-ubuntu_xenial.yaml index 1b8af52837..4d485fea42 100644 --- a/nova/values_overrides/queens-ubuntu_xenial.yaml +++ b/nova/values_overrides/queens-ubuntu_xenial.yaml @@ -20,7 +20,7 @@ images: nova_novncproxy_assets: "docker.io/openstackhelm/nova:queens-ubuntu_xenial" nova_placement: "docker.io/openstackhelm/nova:queens-ubuntu_xenial" nova_scheduler: "docker.io/openstackhelm/nova:queens-ubuntu_xenial" - #nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' + #nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' nova_spiceproxy: "docker.io/openstackhelm/nova:queens-ubuntu_xenial" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:queens-ubuntu_xenial" nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial" diff --git a/nova/values_overrides/rocky-opensuse_15.yaml b/nova/values_overrides/rocky-opensuse_15.yaml index 17ebdfc674..0182ace112 100644 --- a/nova/values_overrides/rocky-opensuse_15.yaml +++ b/nova/values_overrides/rocky-opensuse_15.yaml @@ -20,7 +20,7 @@ images: nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15" nova_placement: "docker.io/openstackhelm/nova:rocky-opensuse_15" nova_scheduler: "docker.io/openstackhelm/nova:rocky-opensuse_15" - #nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' + #nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15" nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15" diff --git a/nova/values_overrides/rocky-ubuntu_bionic.yaml b/nova/values_overrides/rocky-ubuntu_bionic.yaml index 0d53f11ef9..d5fb998895 100644 --- a/nova/values_overrides/rocky-ubuntu_bionic.yaml +++ b/nova/values_overrides/rocky-ubuntu_bionic.yaml @@ -20,7 +20,7 @@ images: nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic" nova_placement: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic" nova_scheduler: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic" - #nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' + #nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic" nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial" diff --git a/nova/values_overrides/rocky-ubuntu_xenial.yaml b/nova/values_overrides/rocky-ubuntu_xenial.yaml index 61770cd6ab..6cdeb81f36 100644 --- a/nova/values_overrides/rocky-ubuntu_xenial.yaml +++ b/nova/values_overrides/rocky-ubuntu_xenial.yaml @@ -20,7 +20,7 @@ images: nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial" nova_placement: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial" nova_scheduler: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial" - #nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' + #nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial" nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial" diff --git a/nova/values_overrides/stein-ubuntu_bionic.yaml b/nova/values_overrides/stein-ubuntu_bionic.yaml index 9d4790aa03..5b14cb06b7 100644 --- a/nova/values_overrides/stein-ubuntu_bionic.yaml +++ b/nova/values_overrides/stein-ubuntu_bionic.yaml @@ -20,7 +20,7 @@ images: nova_novncproxy_assets: "docker.io/openstackhelm/nova:stein-ubuntu_bionic" nova_placement: "docker.io/openstackhelm/nova:stein-ubuntu_bionic" nova_scheduler: "docker.io/openstackhelm/nova:stein-ubuntu_bionic" - #nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3' + #nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial' nova_spiceproxy: "docker.io/openstackhelm/nova:stein-ubuntu_bionic" nova_spiceproxy_assets: "docker.io/openstackhelm/nova:stein-ubuntu_bionic" nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"