Comment out ceph_custom_key

Since there is a check if ceph_custom_key is defined, there is no reason
to define it by default.

Signed-off-by: Rafał Wądołowski <rwadolowski@cloudferro.com>
(cherry picked from commit 55cd6e83e475ab9ad8d684b88da5325d869e9d1c)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 7a805426d1c6a97b2587aba0e02548cf6aafbd1a..16dcc8d3d57c0f357beba048667910e04961b320 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -220,7 +220,7 @@ dummy:
 # a URL to the .repo file to be installed on the targets.  For deb,
 # ceph_custom_repo should be the URL to the repo base.
 #
-#ceph_custom_key: https://server.domain.com/ceph-custom-repo-key.asc
+#ceph_custom_key: https://server.domain.com/ceph-custom-repo/key.asc
 #ceph_custom_repo: https://server.domain.com/ceph-custom-repo
 
 

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 969fec35d3e8beb2abd79e56dd9b2da9a3ca118d..a68723b0380fa50f86e9496ba1c2dbf0a0117fa0 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -220,7 +220,7 @@ ceph_iscsi_config_dev: false
 # a URL to the .repo file to be installed on the targets.  For deb,
 # ceph_custom_repo should be the URL to the repo base.
 #
-#ceph_custom_key: https://server.domain.com/ceph-custom-repo-key.asc
+#ceph_custom_key: https://server.domain.com/ceph-custom-repo/key.asc
 #ceph_custom_repo: https://server.domain.com/ceph-custom-repo
 
 

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 39548fe70b3b63f3bdf2f48bd6104c797f843602..ae5332f864bd61e32aff2060565cfc3995fcdff3 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -212,7 +212,7 @@ ceph_iscsi_config_dev: true # special repo for deploying iSCSI gateways
 # a URL to the .repo file to be installed on the targets.  For deb,
 # ceph_custom_repo should be the URL to the repo base.
 #
-ceph_custom_key: https://server.domain.com/ceph-custom-repo-key.asc
+#ceph_custom_key: https://server.domain.com/ceph-custom-repo/key.asc
 ceph_custom_repo: https://server.domain.com/ceph-custom-repo