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 3ca7d390ad3fbc5a8a836c5a234b2b526f45f498..d7d021d9e67ebca16c0ffec80c983412d38d6855 100644 (file)
--- 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 c9516c73e599415e603af77bd205ba9444e25a4b..1af7191e8ee47ea6392f71176a5dba82899d3675 100644 (file)
--- 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 046a765d4d77f0dfcc0acad502ed41a6c2aceea1..7fbcece14c0c4eef28fa5c8fe5671fa728e8fd3c 100644 (file)
--- 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\r
 ceph_osd_docker_imagename: daemon\r
 ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables\r
-#ceph_osd_docker_device:\r
+#ceph_osd_docker_devices:\r
 # - /dev/sdb\r