aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-31 00:25:00 +0000
committerGerrit Code Review <review@openstack.org>2017-08-31 00:25:00 +0000
commit8c36f13f83acb275a931aa25c3246be239e70f14 (patch)
treedccf3fd04ecf4e4f58438d2b179e63c31901db78 /docker
parente7c822b6e3b3d3747930c101f16e7bdd96c98e2f (diff)
parent0e3b02f2b1e55ace2ff44c10cc82c096fb00412c (diff)
Merge "Use switch to containers instead of take over playbook for ceph-ansible" into stable/pike
Diffstat (limited to 'docker')
-rw-r--r--docker/services/ceph-ansible/ceph-base.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index d78ff7f..bf2c86c 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -49,7 +49,7 @@ parameters:
CephAnsibleUpgradePlaybook:
type: string
description: Path to the ceph-ansible playbook to execute on upgrade
- default: /usr/share/ceph-ansible/infrastructure-playbooks/take-over-existing-cluster.yml
+ default: /usr/share/ceph-ansible/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
CephAnsibleExtraConfig:
type: json
description: Extra vars for the ceph-ansible playbook
@@ -184,6 +184,7 @@ outputs:
ireallymeanit: 'yes'
fsid: { get_param: CephClusterFSID }
docker: true
+ ceph_release: jewel
ceph_docker_registry: {get_attr: [DockerImageUrlParts, value, host]}
ceph_docker_image: {get_attr: [DockerImageUrlParts, value, image]}
ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}