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 #606 from ceph/jewel-start 

ceph-common: fix mon startup for dev installation
pull/608/head
Leseb 2016-03-07 14:06:20 +01:00
parent ebcc7f6207 314ebfb0ae
commit b354445914
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -54,7 +54,7 @@ ansible_provision = proc do |ansible|
} }
else else
ansible.extra_vars = { ansible.extra_vars = {
ceph_stable: 'true', "ceph_#{settings['ceph_install_source']}"=> 'true',
journal_collocation: 'true', journal_collocation: 'true',
journal_size: 100, journal_size: 100,
monitor_interface: ETH, monitor_interface: ETH,

2
roles/ceph-common/tasks/main.yml
View File

@ -57,7 +57,7 @@
# somehow the YAML syntax using "is_ceph_infernalis: {{" # somehow the YAML syntax using "is_ceph_infernalis: {{"
# does NOT work, so we keep this syntax styling... # does NOT work, so we keep this syntax styling...
- set_fact: - set_fact:
is_ceph_infernalis={{ (ceph_stable and ceph_stable_release not in ceph_stable_releases) or (ceph_stable_rh_storage and (rh_storage_version.stdout | version_compare('0.94', '>'))) }} is_ceph_infernalis={{ (ceph_stable and ceph_stable_release not in ceph_stable_releases) or (ceph_dev) or (ceph_stable_rh_storage and (rh_storage_version.stdout | version_compare('0.94', '>'))) }}
- set_fact: - set_fact:
dir_owner: ceph dir_owner: ceph

4
vagrant_variables.yml.sample
View File

@ -10,6 +10,10 @@ mds_vms: 0
rgw_vms: 0 rgw_vms: 0
client_vms: 0 client_vms: 0
# INSTALL SOURCE OF CEPH
# valid values are 'stable' and 'dev'
ceph_install_source: stable
# SUBNET TO USE FOR THE VMS # SUBNET TO USE FOR THE VMS
subnet: 192.168.42 subnet: 192.168.42