Merge "Use switch to containers instead of take over playbook for ceph-ansible"

This commit is contained in:
Jenkins 2017-08-30 12:41:42 +00:00 committed by Gerrit Code Review
commit 43692d1fcc
1 changed files with 2 additions and 1 deletions

View File

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