diff --git a/group_vars/all.sample b/group_vars/all.sample index 61e1317f9..7d528da4f 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -53,7 +53,6 @@ dummy: #centos_package_dependencies: # - python-pycurl # - hdparm -# - yum-plugin-priorities.noarch # - epel-release # - ntp # - python-setuptools @@ -340,3 +339,17 @@ dummy: #mon_containerized_deployment_with_kv: false +################## +# Temporary Vars # +################## +# NOTE(SamYaple): These vars are set here to they are defined before use. They +# should be removed after a refactor has properly seperated all the checks into +# the appropriate roles. + +#journal_collocation: False +#raw_multi_journal: False +#osd_directory: False +#bluestore: False + +#osd_auto_discovery: False + diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index bbd581075..b75a5be19 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -45,7 +45,6 @@ debian_package_dependencies: centos_package_dependencies: - python-pycurl - hdparm - - yum-plugin-priorities.noarch - epel-release - ntp - python-setuptools @@ -124,7 +123,7 @@ ceph_stable_ice_kmod: 3.10-0.1.20140702gitdc9ac62.el7.x86_64 #ceph_stable_ice_password: # htaccess password # ENTERPRISE VERSION RED HAT STORAGE (from 1.3) -# This version is only supported on RHEL 7.1 +# This version is only supported on RHEL >= 7.1 # As of RHEL 7.1, libceph.ko and rbd.ko are now included in Red Hat's kernel # packages natively. The RHEL 7.1 kernel packages are more stable and secure than # using these 3rd-party kmods with RHEL 7.0. Please update your systems to RHEL @@ -235,7 +234,7 @@ mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ## OSD options # -journal_size: 0 +journal_size: 0 # OSD journal size in MB public_network: 0.0.0.0/0 cluster_network: "{{ public_network }}" osd_mkfs_type: xfs