diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index 284fc66db5..c40a72ee03 100644 --- a/ceph-client/values.yaml +++ b/ceph-client/values.yaml @@ -26,10 +26,10 @@ images: tags: ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' ceph_cephfs_provisioner: 'quay.io/external_storage/cephfs-provisioner:v0.1.1' - ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.2' + ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3' ceph_mds: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' ceph_mgr: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' - ceph_rbd_pool: 'docker.io/port/ceph-config-helper:v1.10.2' + ceph_rbd_pool: 'docker.io/port/ceph-config-helper:v1.10.3' ceph_rbd_provisioner: 'quay.io/external_storage/rbd-provisioner:v0.1.1' ceph_rgw: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1' diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml index 06652cf0f6..f5162a3c35 100644 --- a/ceph-mon/values.yaml +++ b/ceph-mon/values.yaml @@ -20,9 +20,9 @@ images: pull_policy: IfNotPresent tags: ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' - ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.2' + ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3' ceph_mon: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' - ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.2' + ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.3' dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1' image_repo_sync: docker.io/docker:17.07.0 local_registry: diff --git a/cinder/values.yaml b/cinder/values.yaml index ca6f0cfd3f..b61e0fa8fa 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -56,9 +56,9 @@ images: cinder_scheduler: docker.io/openstackhelm/cinder:newton cinder_volume: docker.io/openstackhelm/cinder:newton cinder_volume_usage_audit: docker.io/openstackhelm/cinder:newton - cinder_storage_init: docker.io/port/ceph-config-helper:v1.10.2 + cinder_storage_init: docker.io/port/ceph-config-helper:v1.10.3 cinder_backup: docker.io/openstackhelm/cinder:newton - cinder_backup_storage_init: docker.io/port/ceph-config-helper:v1.10.2 + cinder_backup_storage_init: docker.io/port/ceph-config-helper:v1.10.3 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/glance/values.yaml b/glance/values.yaml index 4247bc4859..562650b772 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -39,7 +39,7 @@ release_group: null images: tags: test: docker.io/kolla/ubuntu-source-rally:4.0.0 - glance_storage_init: docker.io/port/ceph-config-helper:v1.10.2 + glance_storage_init: docker.io/port/ceph-config-helper:v1.10.3 db_init: docker.io/openstackhelm/heat:newton glance_db_sync: docker.io/openstackhelm/glance:newton db_drop: docker.io/openstackhelm/heat:newton diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index 95a17d9a81..746c16574d 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -24,7 +24,7 @@ release_group: null images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - gnocchi_storage_init: docker.io/port/ceph-config-helper:v1.10.2 + gnocchi_storage_init: docker.io/port/ceph-config-helper:v1.10.3 db_init_indexer: docker.io/postgres:9.5 # using non-kolla images until kolla supports postgres as # an indexer diff --git a/tools/images/ceph-config-helper/Dockerfile b/tools/images/ceph-config-helper/Dockerfile index 0b5e88d30e..47e4f5ba66 100644 --- a/tools/images/ceph-config-helper/Dockerfile +++ b/tools/images/ceph-config-helper/Dockerfile @@ -1,7 +1,7 @@ FROM docker.io/ubuntu:xenial MAINTAINER pete.birley@att.com -ARG KUBE_VERSION=v1.10.2 +ARG KUBE_VERSION=v1.10.3 ARG CEPH_RELEASE=luminous ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc @@ -26,6 +26,7 @@ RUN set -ex ;\ curl -sSL https://bootstrap.pypa.io/get-pip.py | python ;\ pip --no-cache-dir install --upgrade \ crush \ + rgwadmin \ six \ python-openstackclient \ python-swiftclient ;\ diff --git a/tools/images/ceph-config-helper/Makefile b/tools/images/ceph-config-helper/Makefile index 3c6b3693c4..ef30f5106f 100644 --- a/tools/images/ceph-config-helper/Makefile +++ b/tools/images/ceph-config-helper/Makefile @@ -19,7 +19,7 @@ DOCKER_REGISTRY ?= docker.io IMAGE_NAME ?= ceph-config-helper IMAGE_PREFIX ?= openstackhelm IMAGE_TAG ?= latest -KUBE_VERSION ?= v1.10.2 +KUBE_VERSION ?= v1.10.3 LABEL ?= putlabelshere IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} diff --git a/tools/images/ceph-config-helper/README.rst b/tools/images/ceph-config-helper/README.rst index 73d1b994f0..f153be596a 100644 --- a/tools/images/ceph-config-helper/README.rst +++ b/tools/images/ceph-config-helper/README.rst @@ -31,7 +31,7 @@ repo run: .. code:: bash - export KUBE_VERSION=v1.10.2 + export KUBE_VERSION=v1.10.3 sudo docker build \ --network host \ --build-arg KUBE_VERSION=${KUBE_VERSION} \