From: Sébastien Han <seb@redhat.com>
Date: Tue, 28 Jul 2015 20:05:26 +0000 (+0200)
Subject: Fix dummy mistakes with variables
X-Git-Tag: v1.0.0~147^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F353%2Fhead;p=ceph-ansible.git

Fix dummy mistakes with variables

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

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"