From 0106fa6835e4a4fd7b428830898a2c02815de9a7 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 21 Aug 2017 18:32:40 +0200 Subject: [PATCH] Consume public_network vs ceph_mon_docker_subnet In the switch to containers migration there were broken references to ceph_mon_docker_subnet variable, replaced with public_network. Also fixes references to ceph_mon_docker_extra_env setting for it a default as it could be undefined. --- ...tch-from-non-containerized-to-containerized-ceph-daemons.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml index 1415bad11..87e7ee60f 100644 --- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml +++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml @@ -150,7 +150,7 @@ net: "host" state: "running" privileged: "{{ mon_docker_privileged }}" - env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + monitor_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},CEPH_FSID={{ ceph_fsid.stdout }},{{ ceph_mon_docker_extra_env }}" + env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + monitor_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ public_network }},CEPH_FSID={{ ceph_fsid.stdout }},{{ ceph_mon_docker_extra_env|default('') }}" volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/etc/localtime:/etc/localtime:ro" - name: waiting for the monitor to join the quorum... -- 2.39.5