diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index bdab29111..3319895be 100644 --- a/ceph-client/values.yaml +++ b/ceph-client/values.yaml @@ -25,13 +25,13 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' + ceph_bootstrap: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' 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_mgr: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' + 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_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 + image_repo_sync: 'docker.io/docker:17.07.0' local_registry: active: false exclude: @@ -357,8 +357,8 @@ bootstrap: ceph -s function ensure_pool () { ceph osd pool stats $1 || ceph osd pool create $1 $2 - local test_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo) - if [[ ${test_luminous} -gt 0 ]]; then + local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo) + if [[ ${test_version} -gt 0 ]]; then ceph osd pool application enable $1 $3 fi } diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml index b4dd48b59..ec00c295d 100644 --- a/ceph-mon/values.yaml +++ b/ceph-mon/values.yaml @@ -24,12 +24,12 @@ deployment: images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' + ceph_bootstrap: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' 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:master-0b3eb04-mimic-centos-7-x86_64' 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 + image_repo_sync: 'docker.io/docker:17.07.0' local_registry: active: false exclude: @@ -228,8 +228,8 @@ bootstrap: ceph -s function ensure_pool () { ceph osd pool stats $1 || ceph osd pool create $1 $2 - local test_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo) - if [[ ${test_luminous} -gt 0 ]]; then + local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo) + if [[ ${test_version} -gt 0 ]]; then ceph osd pool application enable $1 $3 fi } diff --git a/ceph-osd/templates/bin/osd/_common.sh.tpl b/ceph-osd/templates/bin/osd/_common.sh.tpl index 58861493e..96da6c937 100644 --- a/ceph-osd/templates/bin/osd/_common.sh.tpl +++ b/ceph-osd/templates/bin/osd/_common.sh.tpl @@ -29,8 +29,8 @@ eval CRUSH_FAILURE_DOMAIN_TYPE=$(cat /etc/ceph/storage.json | python -c 'import eval CRUSH_FAILURE_DOMAIN_NAME=$(cat /etc/ceph/storage.json | python -c 'import sys, json; data = json.load(sys.stdin); print(json.dumps(data["failure_domain_name"]))') eval CRUSH_FAILURE_DOMAIN_BY_HOSTNAME=$(cat /etc/ceph/storage.json | python -c 'import sys, json; data = json.load(sys.stdin); print(json.dumps(data["failure_domain_by_hostname"]))') -if [[ $(ceph -v | egrep -q "12.2|luminous"; echo $?) -ne 0 ]]; then - echo "ERROR- need Luminous release" +if [[ $(ceph -v | egrep -q "mimic|luminous"; echo $?) -ne 0 ]]; then + echo "ERROR- need Luminous/Mimic release" exit 1 fi diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml index 194c123b7..6ae9ebc64 100644 --- a/ceph-osd/values.yaml +++ b/ceph-osd/values.yaml @@ -20,11 +20,11 @@ images: pull_policy: IfNotPresent tags: - ceph_osd: '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_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_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 + image_repo_sync: 'docker.io/docker:17.07.0' local_registry: active: false exclude: @@ -124,7 +124,7 @@ conf: # match the failure domain used on your CRUSH rules for pools. For example with a crush rule of # rack_replicated_rule you would specify "rack" as the `failure_domain` to use. # `failure_domain`: Set the CRUSH bucket type for your OSD to reside in. See the supported CRUSH configuration - # as listed here: Supported CRUSH configuration is listed here: http://docs.ceph.com/docs/luminous/rados/operations/crush-map/ + # as listed here: Supported CRUSH configuration is listed here: http://docs.ceph.com/docs/mimic/rados/operations/crush-map/ # `failure_domain_by_hostname`: Specify the portion of the hostname to use for your failure domain bucket name. # `failure_domain_name`: Manually name the failure domain bucket name. This configuration option should only be used # when using host based overrides. @@ -134,6 +134,7 @@ conf: # NOTE(supamatt): Add a configurable option to reset the past interval time of a PG. # This solves an open bug within Ceph Luminous releases. https://tracker.ceph.com/issues/21142 + # Not required for Mimic releases. osd_pg_interval_fix: "false" # NOTE(portdirect): for homogeneous clusters the `osd` key can be used to @@ -210,8 +211,8 @@ bootstrap: ceph -s function ensure_pool () { ceph osd pool stats $1 || ceph osd pool create $1 $2 - local test_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo) - if [[ ${test_luminous} -gt 0 ]]; then + local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo) + if [[ ${test_version} -gt 0 ]]; then ceph osd pool application enable $1 $3 fi } diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 2d0171ccc..d41836d68 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -28,12 +28,12 @@ release_group: null images: pull_policy: IfNotPresent tags: - ceph_bootstrap: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04' + ceph_bootstrap: 'docker.io/ceph/daemon:master-0b3eb04-mimic-centos-7-x86_64' 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' 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: active: false exclude: @@ -161,8 +161,8 @@ bootstrap: ceph -s function ensure_pool () { ceph osd pool stats $1 || ceph osd pool create $1 $2 - local test_luminous=$(ceph tell osd.* version | egrep -c "12.2|luminous" | xargs echo) - if [[ ${test_luminous} -gt 0 ]]; then + local test_version=$(ceph tell osd.* version | egrep -c "mimic|luminous" | xargs echo) + if [[ ${test_version} -gt 0 ]]; then ceph osd pool application enable $1 $3 fi } diff --git a/ceph-rgw/templates/bin/rgw/_init_keystone.sh.tpl b/ceph-rgw/templates/bin/rgw/_init_keystone.sh.tpl index 86f41a394..63af6ba92 100644 --- a/ceph-rgw/templates/bin/rgw/_init_keystone.sh.tpl +++ b/ceph-rgw/templates/bin/rgw/_init_keystone.sh.tpl @@ -23,7 +23,7 @@ cp -va /tmp/ceph.conf /etc/ceph/ceph.conf cat >> /etc/ceph/ceph.conf <