]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
rolling_update: update ceph_key task for container
authorSébastien Han <seb@redhat.com>
Mon, 19 Nov 2018 16:16:00 +0000 (17:16 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Tue, 27 Nov 2018 16:47:40 +0000 (16:47 +0000)
Use the new way to create keys on containerized env as introduced by: 1098b71bda90db3dad19ac179f0ba900ccb0f953

Signed-off-by: Sébastien Han <seb@redhat.com>
infrastructure-playbooks/rolling_update.yml

index 7054bf8b6628c4371d6957db52f849221a0a2977..3d417c8620e86e0bd6b22130e3a20a454ae51e50 100644 (file)
           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