diff --git a/Vagrantfile b/Vagrantfile
index cba6d4399..6ba143f1e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -9,7 +9,7 @@ DEBUG = false
 config_file=File.expand_path(File.join(File.dirname(__FILE__), 'vagrant_variables.yml'))
 settings=YAML.load_file(config_file)
 
-LABEL_PREFIX   = ""
+LABEL_PREFIX   = settings['label_prefix'] ? settings['label_prefix'] : ""
 NMONS          = settings['mon_vms']
 NOSDS          = settings['osd_vms']
 NMDSS          = settings['mds_vms']
diff --git a/group_vars/all.sample b/group_vars/all.sample
index 0c4ed4ae2..feff95f6c 100644
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -132,8 +132,8 @@ dummy:
 #
 #ceph_rhcs: false
 # This will affect how/what repositories are enabled depending on the desired
-# version. The next version will use "2" not "2.0" which would not work.
-#ceph_rhcs_version: 1.3 # next version is 2
+# version. The previous version was 1.3. The current version is 2.
+#ceph_rhcs_version: 2
 #ceph_rhcs_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
 #ceph_rhcs_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
 #ceph_rhcs_iso_path:
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 43276d767..ae604acac 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -137,8 +137,8 @@ ceph_stable_redhat_distro: el7
 #
 ceph_rhcs: false
 # This will affect how/what repositories are enabled depending on the desired
-# version. The next version will use "2" not "2.0" which would not work.
-ceph_rhcs_version: 1.3 # next version is 2
+# version. The previous version was 1.3. The current version is 2.
+ceph_rhcs_version: 2
 ceph_rhcs_cdn_install: false # assumes all the nodes can connect to cdn.redhat.com
 ceph_rhcs_iso_install: false # usually used when nodes don't have access to cdn.redhat.com
 #ceph_rhcs_iso_path:
diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 61bd2cf42..a068392dc 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -56,9 +56,6 @@ public_network = {{ public_network }}
 {% if cluster_network is defined %}
 cluster_network = {{ cluster_network }}
 {% endif %}
-{% if common_single_host_mode is defined %}
-osd crush chooseleaf type = 0
-{% endif %}
 
 [client.libvirt]
 admin socket = {{ rbd_client_admin_socket_path }}/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor
diff --git a/vagrant_variables.yml.linode b/vagrant_variables.yml.linode
index 60d55860d..80fb5931e 100644
--- a/vagrant_variables.yml.linode
+++ b/vagrant_variables.yml.linode
@@ -3,6 +3,9 @@
 vagrant_box: 'linode'
 vagrant_box_url: 'https://github.com/displague/vagrant-linode/raw/master/box/linode.box'
 
+# Set a label prefix for the machines in this cluster. (This is useful and necessary when running multiple clusters concurrently.)
+#label_prefix: 'foo'
+
 ssh_username: 'vagrant'
 ssh_private_key_path: '~/.ssh/id_rsa'