From: Sébastien Han <seb@redhat.com>
Date: Mon, 19 Nov 2018 16:16:00 +0000 (+0100)
Subject: rolling_update: update ceph_key task for container
X-Git-Tag: v4.0.0beta1~177
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49e0e190562256b70717590f41ce448f50e89c3c;p=ceph-ansible.git

rolling_update: update ceph_key task for container

Use the new way to create keys on containerized env as introduced by: 1098b71bda90db3dad19ac179f0ba900ccb0f953

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 7054bf8b6..3d417c862 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -277,7 +277,10 @@
           osd: allow *
           mds: allow *
         cluster: "{{ cluster }}"
-        containerized: "docker exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }}"
+      environment:
+        CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
+        CEPH_UID: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
+        CEPH_CONTAINER_BINARY: "{{ container_binary }}"
       when:
         - containerized_deployment
         - cephx