From 0e3b02f2b1e55ace2ff44c10cc82c096fb00412c Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Tue, 22 Aug 2017 16:15:56 +0200 Subject: Use switch to containers instead of take over playbook for ceph-ansible On upgrade we need to run a specific playbook for ceph-ansible to be able to take over the pre-existing Ceph cluster deployed with puppet-ceph and the migrate it into a containerized deployment. This changes the playbook we use on upgrade so that it migrates the cluster in containers in addition to taking over the cluster. Change-Id: I353c219832c41328f298fa7b65768ecf26c37f29 (cherry picked from commit cab266c9b2b62c0033f8fb66e8e61b7aa46b3e2b) --- docker/services/ceph-ansible/ceph-base.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/services') diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index d78ff7fd..bf2c86c4 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]} -- cgit 1.2.3-korg