From: Sébastien Han Date: Tue, 28 Jul 2015 13:32:58 +0000 (+0200) Subject: Add customisable env variables X-Git-Tag: v1.0.0~153^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=329e4e4793e8da615642378f02c29544f87edade;p=ceph-ansible.git Add customisable env variables Now we can easily pass new variables to bootstrap the container. Signed-off-by: Sébastien Han --- diff --git a/group_vars/mons.sample b/group_vars/mons.sample index 44b0b4d79..6c35f81aa 100644 --- a/group_vars/mons.sample +++ b/group_vars/mons.sample @@ -58,3 +58,4 @@ dummy: #ceph_mon_docker_imagename: "daemon" #ceph_mon_docker_interface: eth0 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface +#ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml index da2298a51..5bc220fcc 100644 --- a/roles/ceph-mon/defaults/main.yml +++ b/roles/ceph-mon/defaults/main.yml @@ -56,3 +56,4 @@ ceph_mon_docker_interface: eth0 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface ceph_mon_docker_username: ceph ceph_mon_docker_imagename: daemon +ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables diff --git a/roles/ceph-mon/tasks/docker.yml b/roles/ceph-mon/tasks/docker.yml index 31afb8632..74f0d4983 100644 --- a/roles/ceph-mon/tasks/docker.yml +++ b/roles/ceph-mon/tasks/docker.yml @@ -51,7 +51,7 @@ name="{{ ansible_hostname }}" net="host" state="running" - env="MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }}" + env="MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},{{ ceph_mon_extra_envs }}" volumes="/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph" - name: push ceph files to the ansible server