From 21a37e23b3397ba7dac845192fe394d9009ac5a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Wa=CC=A8do=C5=82owski?= Date: Thu, 20 Aug 2020 10:13:43 +0200 Subject: [PATCH] Comment out ceph_custom_key MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 55cd6e83e475ab9ad8d684b88da5325d869e9d1c) --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 7a805426d..16dcc8d3d 100644 --- 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 969fec35d..a68723b03 100644 --- 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 39548fe70..ae5332f86 100644 --- 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 -- 2.39.5