openstack/openstack-helm
Code Issues Proposed changes

Ceph-config-helper: Add rgwadmin python package

Browse Source 
This adds the rgwadmin python package to the ceph config helper
image, allowing it to be used for creating s3 buckets for radosgw
to be used with elasticsearch

Change-Id: I2c633a4715ef1fdccd833cc8eeaefddbecb0cec4
This commit is contained in:
Steve Wilkerson 2018-06-07 13:36:53 -05:00
parent d76591d974
commit 9c44676649
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceph-client/values.yaml
View File

@ -26,10 +26,10 @@ images:
tags: tags:
ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' 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_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_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_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_rbd_provisioner: 'quay.io/external_storage/rbd-provisioner:v0.1.1'
ceph_rgw: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' ceph_rgw: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1' dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'

4
ceph-mon/values.yaml
View File

@ -20,9 +20,9 @@ images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: tags:
ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' 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: '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' dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
local_registry: local_registry:

4
cinder/values.yaml
View File

@ -56,9 +56,9 @@ images:
cinder_scheduler: docker.io/openstackhelm/cinder:newton cinder_scheduler: docker.io/openstackhelm/cinder:newton
cinder_volume: docker.io/openstackhelm/cinder:newton cinder_volume: docker.io/openstackhelm/cinder:newton
cinder_volume_usage_audit: 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: 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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

2
glance/values.yaml
View File

@ -39,7 +39,7 @@ release_group: null
images: images:
tags: tags:
test: docker.io/kolla/ubuntu-source-rally:4.0.0 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 db_init: docker.io/openstackhelm/heat:newton
glance_db_sync: docker.io/openstackhelm/glance:newton glance_db_sync: docker.io/openstackhelm/glance:newton
db_drop: docker.io/openstackhelm/heat:newton db_drop: docker.io/openstackhelm/heat:newton

2
gnocchi/values.yaml
View File

@ -24,7 +24,7 @@ release_group: null
images: images:
tags: tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 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 db_init_indexer: docker.io/postgres:9.5
# using non-kolla images until kolla supports postgres as # using non-kolla images until kolla supports postgres as
# an indexer # an indexer

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

@ -1,7 +1,7 @@
FROM docker.io/ubuntu:xenial FROM docker.io/ubuntu:xenial
MAINTAINER pete.birley@att.com MAINTAINER pete.birley@att.com
ARG KUBE_VERSION=v1.10.2 ARG KUBE_VERSION=v1.10.3
ARG CEPH_RELEASE=luminous ARG CEPH_RELEASE=luminous
ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc 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 ;\ curl -sSL https://bootstrap.pypa.io/get-pip.py | python ;\
pip --no-cache-dir install --upgrade \ pip --no-cache-dir install --upgrade \
crush \ crush \
rgwadmin \
six \ six \
python-openstackclient \ python-openstackclient \
python-swiftclient ;\ python-swiftclient ;\

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

@ -19,7 +19,7 @@ DOCKER_REGISTRY ?= docker.io
IMAGE_NAME ?= ceph-config-helper IMAGE_NAME ?= ceph-config-helper
IMAGE_PREFIX ?= openstackhelm IMAGE_PREFIX ?= openstackhelm
IMAGE_TAG ?= latest IMAGE_TAG ?= latest
KUBE_VERSION ?= v1.10.2 KUBE_VERSION ?= v1.10.3
LABEL ?= putlabelshere LABEL ?= putlabelshere
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} 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 .. code:: bash
export KUBE_VERSION=v1.10.2 export KUBE_VERSION=v1.10.3
sudo docker build \ sudo docker build \
--network host \ --network host \
--build-arg KUBE_VERSION=${KUBE_VERSION} \ --build-arg KUBE_VERSION=${KUBE_VERSION} \