Merge pull request #606 from ceph/jewel-start

ceph-common: fix mon startup for dev installation

Vagrantfile

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

roles/ceph-common/tasks/main.yml

@@ -57,7 +57,7 @@
 # somehow the YAML syntax using "is_ceph_infernalis: {{"
 # does NOT work, so we keep this syntax styling...
 - 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:
     dir_owner: ceph

vagrant_variables.yml.sample

@@ -10,6 +10,10 @@ mds_vms: 0
 rgw_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: 192.168.42