From 3b32abee4d5f2281bd7e9bacf897c7950a1a8688 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 28 Jul 2015 22:05:26 +0200 Subject: [PATCH] Fix dummy mistakes with variables MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- group_vars/mdss.sample | 2 +- roles/ceph-mds/defaults/main.yml | 2 +- roles/ceph-mds/tasks/docker/start_docker_mds.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/mdss.sample b/group_vars/mdss.sample index 031ece6ba..6b9eb5887 100644 --- a/group_vars/mdss.sample +++ b/group_vars/mdss.sample @@ -11,4 +11,4 @@ dummy: #ceph_containerized_deployment: false #ceph_mds_docker_username: ceph #ceph_mds_docker_imagename: daemon -#ceph_mds_docker_extra_envs: "MDS_NAME={{ ansible_hostname }}" # comma separated variables +#ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml index c4de31f68..c99be4fa5 100644 --- a/roles/ceph-mds/defaults/main.yml +++ b/roles/ceph-mds/defaults/main.yml @@ -11,4 +11,4 @@ cephx: true ceph_containerized_deployment: false ceph_mds_docker_username: ceph ceph_mds_docker_imagename: daemon -ceph_mds_docker_extra_envs: "MDS_NAME={{ ansible_hostname }}" # comma separated variables +ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables diff --git a/roles/ceph-mds/tasks/docker/start_docker_mds.yml b/roles/ceph-mds/tasks/docker/start_docker_mds.yml index dc9e16727..e77e503d3 100644 --- a/roles/ceph-mds/tasks/docker/start_docker_mds.yml +++ b/roles/ceph-mds/tasks/docker/start_docker_mds.yml @@ -5,5 +5,5 @@ name=ceph-{{ ansible_hostname }}-mds net=host state=running - env="CEPHFS_CREATE=1,{{ ceph_osd_docker_extra_env }}" + env="CEPH_DAEMON=MDS,CEPHFS_CREATE=1,{{ ceph_mds_docker_extra_env }}" volumes="/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph" -- 2.39.5