openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Ceph: Update default to use OSH image"

Browse Source
This commit is contained in:
Zuul 2019-02-04 02:45:41 +00:00 committed by Gerrit Code Review
commit e0a858b8c2
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceph-client/values.yaml
View File

@ -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'

2
ceph-mon/templates/bin/utils/_checkPGs.py.tpl
View File

@ -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:

4
ceph-mon/values.yaml
View File

@ -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'

4
ceph-osd/values.yaml
View File

@ -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'

2
ceph-provisioners/values.yaml
View File

@ -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'

2
ceph-rgw/values.yaml
View File

@ -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'

2
elasticsearch/values.yaml
View File

@ -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

8
helm-toolkit/templates/scripts/_create-s3-bucket.sh.tpl
View File

@ -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"