ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #534 from ceph/fix-osd-typo 

ceph-osd: docker: fix type
pull/535/head
Leseb 2016-02-11 17:59:07 +01:00
parent dfcaf1b6d0 a3cc055e61
commit 78cb5cc726
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -49,7 +49,7 @@ ansible_provision = proc do |ansible|
ceph_mon_docker_interface: ETH, ceph_mon_docker_interface: ETH,
ceph_mon_docker_subnet: "#{SUBNET}.0/24", ceph_mon_docker_subnet: "#{SUBNET}.0/24",
ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK,OSD_JOURNAL_SIZE=100", 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 ceph_rgw_civetweb_port: 8080
} }
else else

2
group_vars/osds.sample
View File

@ -117,5 +117,5 @@ osd_crush_location: "'root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host
#ceph_osd_docker_username: ceph #ceph_osd_docker_username: ceph
#ceph_osd_docker_imagename: daemon #ceph_osd_docker_imagename: daemon
#ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables #ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables
#ceph_osd_docker_device: #ceph_osd_docker_devices:
# - /dev/sdb # - /dev/sdb

2
roles/ceph-osd/defaults/main.yml
View File

@ -112,5 +112,5 @@ osd_containerized_deployment: false
ceph_osd_docker_username: ceph ceph_osd_docker_username: ceph
ceph_osd_docker_imagename: daemon ceph_osd_docker_imagename: daemon
ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables
#ceph_osd_docker_device: #ceph_osd_docker_devices:
# - /dev/sdb # - /dev/sdb