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 ecf8b539cd895bb90a650141f5e429894fa31996..cb378737ce08a9ae06d6baa4ca400ac4207d1112 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -222,7 +222,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 417868951a07e8bf738f217649438dbb09d26e85..9906d56b17835ab9942a5b791d185ee720db8c1c 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -222,7 +222,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 2ccfa047a44dd983368068984dfa4e97bdcdc566..13f5f0f5e287bdbec437e0790ff568a4bd3f5a8f 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -214,7 +214,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