fail if fqdn deployment attempted

fqdn configuration possibility caused a lot of trouble, it's adding a
lot of complexity because of multiple cases and the relation between
ceph-ansible and ceph-container. Moreover, there is no benefit for such
a feature.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1613155
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index a68999ee3b12330bc6ee78b39f9afe0a7e958619..b05682fe17e9dad8a17c8b2f2b13aaac322fa52c 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -616,3 +616,9 @@ dummy:
 #  - { name: client.gnocchi, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_gnocchi_pool.name }}"}, mode: "0600", }
 #  - { name: client.openstack, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_glance_pool.name }}, profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
 
+
+###############
+# DEPRECATION #
+###############
+
+#use_fqdn_yes_i_am_sure: false

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 2b25c3a2adb00bf5dd9d45e15b4f2e8d8fd5bc01..9bd2d3c42a1e8aafb603348e1100e0bc16ac044d 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -616,3 +616,9 @@ ceph_rhcs_version: 3
 #  - { name: client.gnocchi, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_gnocchi_pool.name }}"}, mode: "0600", }
 #  - { name: client.openstack, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_glance_pool.name }}, profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
 
+
+###############
+# DEPRECATION #
+###############
+
+#use_fqdn_yes_i_am_sure: false

diff --git a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
index b19848adf2758ff485d5fc677dae35f1499d0060..497378d98d1fff90053f4a83718870b7d22e966d 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
+++ b/roles/ceph-common/tasks/checks/check_mandatory_vars.yml
@@ -82,3 +82,10 @@
     - radosgw_interface == 'interface'
     - radosgw_address == 'address'
     - radosgw_address_block == 'subnet'
+
+- 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 or mds_use_fqdn
+    - not use_fqdn_yes_i_am_sure
\ No newline at end of file

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 863f95fb8e5fc5af2269f2dc12d40e1cdb41b494..f47749cd6830f04bfbcb3afa8c272a0ef1d29883 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -608,3 +608,10 @@ openstack_keys:
   - { name: client.cinder-backup, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
   - { name: client.gnocchi, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_gnocchi_pool.name }}"}, mode: "0600", }
   - { name: client.openstack, caps: { mon: "profile rbd", osd: "profile rbd pool={{ openstack_glance_pool.name }}, profile rbd pool={{ openstack_nova_pool.name }}, profile rbd pool={{ openstack_cinder_pool.name }}, profile rbd pool={{ openstack_cinder_backup_pool.name }}"}, mode: "0600" }
+
+
+###############
+# DEPRECATION #
+###############
+
+use_fqdn_yes_i_am_sure: false
\ No newline at end of file

diff --git a/roles/ceph-docker-common/tasks/check_mandatory_vars.yml b/roles/ceph-docker-common/tasks/check_mandatory_vars.yml
index 011433b20515c29dda2a06ec5a5044680230dd83..3e3e1e0f07bfecf09a9e782c024bb9b5ba527c85 100644 (file)
--- a/roles/ceph-docker-common/tasks/check_mandatory_vars.yml
+++ b/roles/ceph-docker-common/tasks/check_mandatory_vars.yml
@@ -16,3 +16,10 @@
     - radosgw_interface == 'interface'
     - radosgw_address == 'address'
     - radosgw_address_block == 'subnet'
+
+- 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 or mds_use_fqdn
+    - not use_fqdn_yes_i_am_sure
\ No newline at end of file