openstack/openstack-helm
Code Issues Proposed changes

Ceph: Fix config helper image and bump version

Browse Source 
This PS adds the ceph-clients to the config helper image, which
were previously missed and also bumps the version used.

Change-Id: I6b62990895619759794e55e694243182bf51f3ca
This commit is contained in:
portdirect 2018-04-04 11:33:43 -04:00 committed by Pete Birley
parent 5b9f231788
commit 5ad77593ee
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph/values.yaml
View File

@ -25,11 +25,11 @@ 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.9.6'
ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.0'
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_mon: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.9.6'
ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.0'
ceph_osd: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
ceph_rbd_pool: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
ceph_rbd_provisioner: 'quay.io/external_storage/rbd-provisioner:v0.1.1'

3
tools/images/ceph-config-helper/Dockerfile
View File

@ -1,7 +1,7 @@
FROM docker.io/ubuntu:xenial
MAINTAINER pete.birley@att.com
ARG KUBE_VERSION=v1.9.6
ARG KUBE_VERSION=v1.10.0
ARG CEPH_RELEASE=luminous
ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
@ -17,6 +17,7 @@ RUN set -ex ;\
apt-get install -y \
apt-transport-https \
ca-certificates \
ceph \
curl \
python \
jq ;\

2
tools/images/ceph-config-helper/Makefile
View File

@ -19,7 +19,7 @@ DOCKER_REGISTRY ?= docker.io
IMAGE_NAME ?= ceph-config-helper
IMAGE_PREFIX ?= openstackhelm
IMAGE_TAG ?= latest
KUBE_VERSION ?= v1.9.6
KUBE_VERSION ?= v1.10.0
LABEL ?= putlabelshere
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}

2
tools/images/ceph-config-helper/README.rst
View File

@ -31,7 +31,7 @@ repo run:
.. code:: bash
export KUBE_VERSION=v1.9.6
export KUBE_VERSION=v1.10.0
sudo docker build \
--network host \
--build-arg KUBE_VERSION=${KUBE_VERSION} \