From a3cc055e618b413c00b71eecba2faaad1d74817b Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 11 Feb 2016 17:57:10 +0100 Subject: [PATCH] ceph-osd: docker: fix type MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit use ceph_osd_docker_devices and not ceph_osd_docker_device Signed-off-by: Sébastien Han --- Vagrantfile | 2 +- group_vars/osds.sample | 2 +- roles/ceph-osd/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 -- 2.47.3