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 031ece6baf110deb799111360a62b5b416429683..6b9eb58870fc383c32b2001b8c7b54713818f038 100644 (file)
--- a/group_vars/mdss.sample
+++ b/group_vars/mdss.sample
@@ -11,4 +11,4 @@ dummy:
 #ceph_containerized_deployment: false\r
 #ceph_mds_docker_username: ceph\r
 #ceph_mds_docker_imagename: daemon\r
-#ceph_mds_docker_extra_envs: "MDS_NAME={{ ansible_hostname }}" # comma separated variables\r
+#ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables\r

diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml
index c4de31f682dc95036877e8105810958f0c713b8f..c99be4fa52645cda842a3bf7f9ed5e7d9f15e1f9 100644 (file)
--- a/roles/ceph-mds/defaults/main.yml
+++ b/roles/ceph-mds/defaults/main.yml
@@ -11,4 +11,4 @@ cephx: true
 ceph_containerized_deployment: false\r
 ceph_mds_docker_username: ceph\r
 ceph_mds_docker_imagename: daemon\r
-ceph_mds_docker_extra_envs: "MDS_NAME={{ ansible_hostname }}" # comma separated variables\r
+ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables\r

diff --git a/roles/ceph-mds/tasks/docker/start_docker_mds.yml b/roles/ceph-mds/tasks/docker/start_docker_mds.yml
index dc9e16727b070c486850fe23758b9cc60d99c85d..e77e503d3338f9a9aa84bd2b21e11670b0c5c527 100644 (file)
--- 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"