From 4e7fb5d45a08137dd203561b4965262189940af2 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 14 Jan 2020 11:54:36 -0500 Subject: [PATCH] drop use_fqdn variables This has been deprecated in the previous releases. Let's drop it. Signed-off-by: Dimitri Savineau --- group_vars/all.yml.sample | 3 --- group_vars/rhcs.yml.sample | 3 --- roles/ceph-config/templates/ceph.conf.j2 | 4 +--- roles/ceph-defaults/defaults/main.yml | 3 --- roles/ceph-facts/tasks/facts.yml | 12 ------------ roles/ceph-validate/tasks/main.yml | 7 ------- 6 files changed, 1 insertion(+), 31 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 0f44c4942..1aea5fb63 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -330,7 +330,6 @@ dummy: #monitor_address_block: subnet # set to either ipv4 or ipv6, whichever your network is using #ip_version: ipv4 -#mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf #mon_host_v1: # enabled: True @@ -395,7 +394,6 @@ dummy: ## MDS options # -#mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the ceph.conf #mds_max_mds: 1 ## Rados Gateway options @@ -833,7 +831,6 @@ dummy: # DEPRECATION # ############### -#use_fqdn_yes_i_am_sure: false ###################################################### diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 7bd9c67c4..4f6d4a73c 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -330,7 +330,6 @@ ceph_iscsi_config_dev: false #monitor_address_block: subnet # set to either ipv4 or ipv6, whichever your network is using #ip_version: ipv4 -#mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf #mon_host_v1: # enabled: True @@ -395,7 +394,6 @@ ceph_iscsi_config_dev: false ## MDS options # -#mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the ceph.conf #mds_max_mds: 1 ## Rados Gateway options @@ -833,7 +831,6 @@ alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alert # DEPRECATION # ############### -#use_fqdn_yes_i_am_sure: false ###################################################### diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2 index d90a74ad5..0740854f1 100644 --- a/roles/ceph-config/templates/ceph.conf.j2 +++ b/roles/ceph-config/templates/ceph.conf.j2 @@ -26,9 +26,7 @@ osd crush chooseleaf type = 0 {% if nb_mon > 0 and inventory_hostname in groups.get(mon_group_name, []) %} mon initial members = {% for host in groups[mon_group_name] %} - {% if hostvars[host]['ansible_fqdn'] is defined and mon_use_fqdn -%} - {{ hostvars[host]['ansible_fqdn'] }} - {%- elif hostvars[host]['ansible_hostname'] is defined -%} + {% if hostvars[host]['ansible_hostname'] is defined -%} {{ hostvars[host]['ansible_hostname'] }} {%- endif %} {%- if not loop.last %},{% endif %} diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index df2ac751b..050447af0 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -322,7 +322,6 @@ monitor_address: x.x.x.x monitor_address_block: subnet # set to either ipv4 or ipv6, whichever your network is using ip_version: ipv4 -mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf mon_host_v1: enabled: True @@ -387,7 +386,6 @@ filestore_xattr_use_omap: null ## MDS options # -mds_use_fqdn: false # if set to true, the MDS name used will be the fqdn in the ceph.conf mds_max_mds: 1 ## Rados Gateway options @@ -825,7 +823,6 @@ client_connections: {} # DEPRECATION # ############### -use_fqdn_yes_i_am_sure: false ###################################################### diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml index 5a5c5ad9e..fa5031b4a 100644 --- a/roles/ceph-facts/tasks/facts.yml +++ b/roles/ceph-facts/tasks/facts.yml @@ -31,12 +31,6 @@ - name: set_fact monitor_name ansible_hostname set_fact: monitor_name: "{{ ansible_hostname }}" - when: not mon_use_fqdn | bool - -- name: set_fact monitor_name ansible_fqdn - set_fact: - monitor_name: "{{ ansible_fqdn }}" - when: mon_use_fqdn | bool - name: find a running monitor when: groups.get(mon_group_name, []) | length > 0 @@ -180,12 +174,6 @@ - name: set_fact mds_name ansible_hostname set_fact: mds_name: "{{ ansible_hostname }}" - when: not mds_use_fqdn | bool - -- name: set_fact mds_name ansible_fqdn - set_fact: - mds_name: "{{ ansible_fqdn }}" - when: mds_use_fqdn | bool - name: set_fact rbd_client_directory_owner ceph set_fact: diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml index 0a87e4e18..90345e00c 100644 --- a/roles/ceph-validate/tasks/main.yml +++ b/roles/ceph-validate/tasks/main.yml @@ -89,13 +89,6 @@ - item.data is undefined with_items: '{{ lvm_volumes }}' -- name: warning deprecation for fqdn configuration - fail: - msg: "fqdn configuration is not supported anymore. Use 'use_fqdn_yes_i_am_sure: true' if you really want to use it. See release notes for more details" - when: - - mon_use_fqdn | bool or mds_use_fqdn | bool - - not use_fqdn_yes_i_am_sure | bool - - name: debian based systems tasks when: ansible_os_family == 'Debian' block: -- 2.39.5