From 647355be4339174746ee4e8b22dd80ce2c18bb6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 27 Oct 2017 11:46:15 +0200 Subject: [PATCH] default: remove dup variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ceph_repository_type was declared multiple times. This commit fixes this. Signed-off-by: Sébastien Han (cherry picked from commit d2575c7f5e5520f6ee65c5007853b3248d2c7a10) Signed-off-by: Sébastien Han --- group_vars/all.yml.sample | 4 +--- group_vars/rhcs.yml.sample | 4 +--- roles/ceph-defaults/defaults/main.yml | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 7e1818251..14ba14dec 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -105,9 +105,8 @@ dummy: # INSTALL # ########### #ceph_rhcs_cdn_install: False # backward compatibility with stable-2.2, will disappear in stable 3.1 -#ceph_repository_type: "{{ 'cdn' if ceph_rhcs_cdn_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 +#ceph_repository_type: "{{ 'cdn' if ceph_rhcs_cdn_install else 'iso' if ceph_rhcs_iso_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #ceph_rhcs_iso_install: False # backward compatibility with stable-2.2, will disappear in stable 3.1 -#ceph_repository_type: "{{ 'iso' if ceph_rhcs_iso_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #ceph_rhcs: False # backward compatibility with stable-2.2, will disappear in stable 3.1 #ceph_stable: False # backward compatibility with stable-2.2, will disappear in stable 3.1 #ceph_dev: False # backward compatibility with stable-2.2, will disappear in stable 3.1 @@ -178,7 +177,6 @@ dummy: # # #ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}" -#ceph_repository_type: dummy #valid_ceph_repository_type: # - cdn # - iso diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index f457ff0de..b12eca098 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -105,9 +105,8 @@ fetch_directory: ~/ceph-ansible-keys # INSTALL # ########### #ceph_rhcs_cdn_install: False # backward compatibility with stable-2.2, will disappear in stable 3.1 -#ceph_repository_type: "{{ 'cdn' if ceph_rhcs_cdn_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 +#ceph_repository_type: "{{ 'cdn' if ceph_rhcs_cdn_install else 'iso' if ceph_rhcs_iso_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #ceph_rhcs_iso_install: False # backward compatibility with stable-2.2, will disappear in stable 3.1 -#ceph_repository_type: "{{ 'iso' if ceph_rhcs_iso_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 #ceph_rhcs: False # backward compatibility with stable-2.2, will disappear in stable 3.1 #ceph_stable: False # backward compatibility with stable-2.2, will disappear in stable 3.1 #ceph_dev: False # backward compatibility with stable-2.2, will disappear in stable 3.1 @@ -178,7 +177,6 @@ ceph_repository: rhcs # # #ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}" -#ceph_repository_type: dummy #valid_ceph_repository_type: # - cdn # - iso diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index f47dd67c7..57a90c722 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -97,9 +97,8 @@ ceph_use_distro_backports: false # DEBIAN ONLY # INSTALL # ########### ceph_rhcs_cdn_install: False # backward compatibility with stable-2.2, will disappear in stable 3.1 -ceph_repository_type: "{{ 'cdn' if ceph_rhcs_cdn_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 +ceph_repository_type: "{{ 'cdn' if ceph_rhcs_cdn_install else 'iso' if ceph_rhcs_iso_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 ceph_rhcs_iso_install: False # backward compatibility with stable-2.2, will disappear in stable 3.1 -ceph_repository_type: "{{ 'iso' if ceph_rhcs_iso_install else 'dummy' }}" # backward compatibility with stable-2.2, will disappear in stable 3.1 ceph_rhcs: False # backward compatibility with stable-2.2, will disappear in stable 3.1 ceph_stable: False # backward compatibility with stable-2.2, will disappear in stable 3.1 ceph_dev: False # backward compatibility with stable-2.2, will disappear in stable 3.1 @@ -170,7 +169,6 @@ ceph_stable_redhat_distro: el7 # # ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}" -ceph_repository_type: dummy valid_ceph_repository_type: - cdn - iso -- 2.39.5