openstack/openstack-helm
Code Issues Proposed changes

Ceph: Pool management update

Browse Source 
This PS updates the pool management job to change PG params as
required post creation if the osd count increases.

Change-Id: Ib4ed26e6b5be8e7c0f3cafaffde8c5b6a6c07cb2
This commit is contained in:
Pete Birley 2018-04-24 12:47:52 -05:00
parent a4240d627b
commit 3f697b0f16
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceph/templates/bin/pool/_init.sh.tpl
View File

@ -53,6 +53,12 @@ function create_pool () {
fi fi
ceph --cluster "${CLUSTER}" osd pool set "${POOL_NAME}" size ${POOL_REPLICATION} ceph --cluster "${CLUSTER}" osd pool set "${POOL_NAME}" size ${POOL_REPLICATION}
ceph --cluster "${CLUSTER}" osd pool set "${POOL_NAME}" crush_rule "${POOL_CRUSH_RULE}" ceph --cluster "${CLUSTER}" osd pool set "${POOL_NAME}" crush_rule "${POOL_CRUSH_RULE}"
for PG_PARAM in pg_num pgp_num; do
CURRENT_PG_VALUE=$(ceph --cluster ceph osd pool get "${POOL_NAME}" "${PG_PARAM}" | awk "/^${PG_PARAM}:/ { print \$NF }")
if [ "${POOL_PLACEMENT_GROUPS}" -gt "${CURRENT_PG_VALUE}" ]; then
ceph --cluster ceph osd pool set "${POOL_NAME}" "${PG_PARAM}" "${POOL_PLACEMENT_GROUPS}"
fi
done
} }
function manage_pool () { function manage_pool () {

6
ceph/values.yaml
View File

@ -25,13 +25,13 @@ 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.0' ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.1'
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_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.0' ceph_mon_check: 'docker.io/port/ceph-config-helper:v1.10.1'
ceph_osd: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' 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_pool: 'docker.io/port/ceph-config-helper:v1.10.1'
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.0' dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.0'

8
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.0 ARG KUBE_VERSION=v1.10.1
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
@ -14,13 +14,17 @@ RUN set -ex ;\
cd ${TMP_DIR} ;\ cd ${TMP_DIR} ;\
apt-get update ;\ apt-get update ;\
apt-get dist-upgrade -y ;\ apt-get dist-upgrade -y ;\
apt-get install -y \ apt-get install --no-install-recommends -y \
apt-transport-https \ apt-transport-https \
ca-certificates \ ca-certificates \
ceph \ ceph \
curl \ curl \
python \ python \
jq ;\ jq ;\
curl -sSL https://bootstrap.pypa.io/get-pip.py | python ;\
pip --no-cache-dir install --upgrade \
crush \
six ;\
curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\ curl -sSL https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 ;\
mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl ;\ mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl ;\
chmod +x /usr/bin/kubectl ;\ chmod +x /usr/bin/kubectl ;\

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.0 KUBE_VERSION ?= v1.10.1
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.0 export KUBE_VERSION=v1.10.1
sudo docker build \ sudo docker build \
--network host \ --network host \
--build-arg KUBE_VERSION=${KUBE_VERSION} \ --build-arg KUBE_VERSION=${KUBE_VERSION} \