From 6ea6a85198880938aa68d0f35154f899eafcc4d0 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Fri, 1 Feb 2019 15:17:15 -0600 Subject: [PATCH] Ceph: Update default to use OSH image This PS udpates the default image in the chart to the latest OSH image. Change-Id: Ib8d2a72ad48049fe02560dc4405f0088890b6f64 Signed-off-by: Pete Birley --- ceph-client/values.yaml | 6 +++--- ceph-mon/templates/bin/utils/_checkPGs.py.tpl | 2 +- ceph-mon/values.yaml | 4 ++-- ceph-osd/values.yaml | 4 ++-- ceph-provisioners/values.yaml | 2 +- ceph-rgw/values.yaml | 2 +- elasticsearch/values.yaml | 2 +- helm-toolkit/templates/scripts/_create-s3-bucket.sh.tpl | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index 1473e08c2..ea4b278c0 100644 --- a/ceph-client/values.yaml +++ b/ceph-client/values.yaml @@ -25,10 +25,10 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest' ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3' - ceph_mds: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' - ceph_mgr: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' + ceph_mds: 'docker.io/openstackhelm/ceph-daemon:latest' + ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:latest' ceph_rbd_pool: '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' diff --git a/ceph-mon/templates/bin/utils/_checkPGs.py.tpl b/ceph-mon/templates/bin/utils/_checkPGs.py.tpl index 1f05bcae6..5ca67c003 100755 --- a/ceph-mon/templates/bin/utils/_checkPGs.py.tpl +++ b/ceph-mon/templates/bin/utils/_checkPGs.py.tpl @@ -71,7 +71,7 @@ class cephCRUSH(): try: """Retrieve the crush hierarchies""" - crushTree = "ceph osd crush tree -f json-pretty | grep -v '^\[\]'" + crushTree = "ceph osd crush tree -f json-pretty | jq .nodes" chstr = subprocess.check_output(crushTree, shell=True) self.crushHierarchy = json.loads(chstr) except subprocess.CalledProcessError as e: diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml index ec00c295d..3cc962028 100644 --- a/ceph-mon/values.yaml +++ b/ceph-mon/values.yaml @@ -24,9 +24,9 @@ deployment: images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest' ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3' - ceph_mon: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' + ceph_mon: 'docker.io/openstackhelm/ceph-daemon:latest' 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' diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml index 3957e0bb5..7f6c62f19 100644 --- a/ceph-osd/values.yaml +++ b/ceph-osd/values.yaml @@ -20,8 +20,8 @@ images: pull_policy: IfNotPresent tags: - ceph_osd: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' - ceph_bootstrap: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' + ceph_osd: 'docker.io/openstackhelm/ceph-daemon:latest' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest' ceph_config_helper: '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' diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index d41836d68..0b23956de 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -28,7 +28,7 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:latest' ceph_cephfs_provisioner: 'quay.io/external_storage/cephfs-provisioner:v1.1.0-k8s1.10' ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3' ceph_rbd_provisioner: 'quay.io/external_storage/rbd-provisioner:v1.1.0-k8s1.10' diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index 55430fb16..c2b196e4c 100644 --- a/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml @@ -27,7 +27,7 @@ images: pull_policy: IfNotPresent tags: ceph_config_helper: 'docker.io/port/ceph-config-helper:v1.10.3' - ceph_rgw: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' + ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:latest' dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1' image_repo_sync: 'docker.io/docker:17.07.0' rgw_s3_admin: 'docker.io/port/ceph-config-helper:v1.10.3' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index e40e248d3..6ce3ef675 100644 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -23,7 +23,7 @@ images: curator: docker.io/bobrik/curator:5.2.0 elasticsearch: docker.io/srwilkers/elasticsearch-s3:v0.1.0 ceph_key_placement: docker.io/port/ceph-config-helper:v1.10.3 - s3_bucket: docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64 + s3_bucket: docker.io/openstackhelm/ceph-daemon:latest s3_user: docker.io/port/ceph-config-helper:v1.10.3 helm_tests: docker.io/openstackhelm/heat:newton prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.0.1 diff --git a/helm-toolkit/templates/scripts/_create-s3-bucket.sh.tpl b/helm-toolkit/templates/scripts/_create-s3-bucket.sh.tpl index 3fbc498d9..11e1980ed 100644 --- a/helm-toolkit/templates/scripts/_create-s3-bucket.sh.tpl +++ b/helm-toolkit/templates/scripts/_create-s3-bucket.sh.tpl @@ -20,9 +20,9 @@ limitations under the License. function create_rgw_s3_bucket () { if [ "$RGW_PROTO" = "http" ]; then - create_bucket=$(s3cmd mb s3://$S3_BUCKET --host=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --no-encrypt --no-check-certificate --no-ssl) + create_bucket=$(s3cmd mb s3://$S3_BUCKET --host=$RGW_HOST --host-bucket=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --no-ssl) else - create_bucket=$(s3cmd mb s3://$S3_BUCKET --host=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --no-encrypt --no-check-certificate) + create_bucket=$(s3cmd mb s3://$S3_BUCKET --host=$RGW_HOST --host-bucket=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY) fi if [ $? -eq 0 ]; then echo "Bucket $S3_BUCKET created" @@ -35,9 +35,9 @@ function create_rgw_s3_bucket () function modify_bucket_acl () { if [ "$RGW_PROTO" = "http" ]; then - modify_acl=$(s3cmd setacl s3://$S3_BUCKET --host=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --no-encrypt --no-check-certificate --no-ssl --acl-grant=read:$S3_USERNAME --acl-grant=write:$S3_USERNAME) + modify_acl=$(s3cmd setacl s3://$S3_BUCKET --host=$RGW_HOST --host-bucket=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --no-ssl --acl-grant=read:$S3_USERNAME --acl-grant=write:$S3_USERNAME) else - modify_acl=$(s3cmd setacl s3://$S3_BUCKET --host=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --no-encrypt --no-check-certificate --acl-grant=read:$S3_USERNAME --acl-grant=write:$S3_USERNAME) + modify_acl=$(s3cmd setacl s3://$S3_BUCKET --host=$RGW_HOST --host-bucket=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --acl-grant=read:$S3_USERNAME --acl-grant=write:$S3_USERNAME) fi if [ $? -eq 0 ]; then echo "Bucket $S3_BUCKET ACL updated"