From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 13 Aug 2018 13:41:08 +0000 (+0200)
Subject: fail if fqdn deployment attempted
X-Git-Tag: v3.1.0rc18~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=904a0a401783e831f6b808b49ff86737ed12cd9e;p=ceph-ansible.git

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 a68999ee3..b05682fe1 100644
--- 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 2b25c3a2a..9bd2d3c42 100644
--- 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 b19848adf..497378d98 100644
--- 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 863f95fb8..f47749cd6 100644
--- 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 011433b20..3e3e1e0f0 100644
--- 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