From: Sébastien Han <seb@redhat.com>
Date: Thu, 11 Feb 2016 16:57:10 +0000 (+0100)
Subject: ceph-osd: docker: fix type
X-Git-Tag: v1.0.0~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F534%2Fhead;p=ceph-ansible.git

ceph-osd: docker: fix type

use ceph_osd_docker_devices and not ceph_osd_docker_device

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

diff --git a/Vagrantfile b/Vagrantfile
index 3ca7d390a..d7d021d9e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -49,7 +49,7 @@ ansible_provision = proc do |ansible|
       ceph_mon_docker_interface: ETH,
       ceph_mon_docker_subnet: "#{SUBNET}.0/24",
       ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK,OSD_JOURNAL_SIZE=100",
-      ceph_osd_docker_device: settings['disks'],
+      ceph_osd_docker_devices: settings['disks'],
       ceph_rgw_civetweb_port: 8080
     }
   else
diff --git a/group_vars/osds.sample b/group_vars/osds.sample
index c9516c73e..1af7191e8 100644
--- a/group_vars/osds.sample
+++ b/group_vars/osds.sample
@@ -117,5 +117,5 @@ osd_crush_location: "'root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host
 #ceph_osd_docker_username: ceph
 #ceph_osd_docker_imagename: daemon
 #ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables
-#ceph_osd_docker_device:
+#ceph_osd_docker_devices:
 # - /dev/sdb
diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 046a765d4..7fbcece14 100644
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -112,5 +112,5 @@ osd_containerized_deployment: false
 ceph_osd_docker_username: ceph
 ceph_osd_docker_imagename: daemon
 ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables
-#ceph_osd_docker_device:
+#ceph_osd_docker_devices:
 # - /dev/sdb