resync group_vars files

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 39b55edccaca2e498fb932c31734ebdef7c6686a..41c6779017b0ecd56fdcb1c9f4fd87dfbd0cec17 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -397,7 +397,6 @@ dummy:
 #kv_type: etcd
 #kv_endpoint: 127.0.0.1
 #kv_port: 2379
-#containerized_deployment_with_kv: false
 
 
 # this is only here for usage with the rolling_update.yml playbook

diff --git a/group_vars/clients.yml.sample b/group_vars/clients.yml.sample
index 24e00e76de798de89254e726c9d34ec7aa7dcab6..c259e15ad931879c6273bccb41ff7361ea1257e7 100644 (file)
--- a/group_vars/clients.yml.sample
+++ b/group_vars/clients.yml.sample
@@ -22,6 +22,6 @@ dummy:
 # To have have ansible setfacl the generated key for $user, set the acls var like so:
 # acls: ["u:$user:r--"]
 #keys:
-#  - { name: client.test, key: "$(ceph-authtool --gen-print-key)", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test", acls: [] }
-#  - { name: client.test2, key: "$(ceph-authtool --gen-print-key)", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test2", acls: [] }
+#  - { name: client.test, key: "$(ceph-authtool --gen-print-key)", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test", mode: "0600", acls: [] }
+#  - { name: client.test2, key: "$(ceph-authtool --gen-print-key)", mon_cap: "allow r", osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=test2", mode: "0600", acls: [] }
 

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index 2cf8e129298b00b2e258e963f6aa4a1a5739bb32..c0a5cd2405c215931b26b2495941aaa5069e0383 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -200,6 +200,7 @@ dummy:
 # Use 'osd_scenario: lvm' to enable this scenario. Currently we only support dedicated journals
 # when using lvm, not collocated journals.
 # lvm_volumes is a dictionary whose key/value pair represent a data lv and a journal pair.
+# Any logical volume or logical group used must be a name and not a path.
 # Journals can be either a lv, device or partition. You can not use the same journal for many data lvs.
 # For example:
 # lvm_volumes:

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index c929a46e5a70622253ec12eb8cbc74efb5314b56..558f84b7d23f564ac12779b9a50272b8f64561db 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -159,6 +159,7 @@ ceph_rhcs: true
 # version. The previous version was 1.3. The current version is 2.
 #ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}"
 #ceph_rhcs_cdn_install: "{{ ceph_stable_rh_storage_cdn_install | default(false) }}" # assumes all the nodes can connect to cdn.redhat.com
+#ceph_rhcs_cdn_debian_repo: https://customername:customerpasswd@rhcs.download.redhat.com
 #ceph_rhcs_iso_install: "{{ ceph_stable_rh_storage_iso_install | default(false) }}" # usually used when nodes don't have access to cdn.redhat.com
 #ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}"
 #ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}"
@@ -396,7 +397,6 @@ ceph_rhcs: true
 #kv_type: etcd
 #kv_endpoint: 127.0.0.1
 #kv_port: 2379
-#containerized_deployment_with_kv: false
 
 
 # this is only here for usage with the rolling_update.yml playbook

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 2fbea9222d807bbac762c80469a8acb1e09c2957..3d0a055970c16637633212223b68d4bc0438646b 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -389,7 +389,6 @@ ceph_docker_on_openstack: false
 kv_type: etcd
 kv_endpoint: 127.0.0.1
 kv_port: 2379
-containerized_deployment_with_kv: false
 
 
 # this is only here for usage with the rolling_update.yml playbook