From c6d3bb5e92800fe068874ac7979529de0e905738 Mon Sep 17 00:00:00 2001
From: Seena Fallah <seenafallah@gmail.com>
Date: Sat, 17 Feb 2024 15:21:24 +0100
Subject: [PATCH] refactor: remove multisite leftovers

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
---
 group_vars/realm.yml.sample                   | 15 -----
 group_vars/zone.yml.sample                    | 12 ----
 .../templates/restart_rgw_daemon.sh.j2        |  2 +-
 .../tasks/check_rgw_multisite.yml             | 65 -------------------
 4 files changed, 1 insertion(+), 93 deletions(-)
 delete mode 100644 group_vars/realm.yml.sample
 delete mode 100644 group_vars/zone.yml.sample
 delete mode 100644 roles/ceph-validate/tasks/check_rgw_multisite.yml

diff --git a/group_vars/realm.yml.sample b/group_vars/realm.yml.sample
deleted file mode 100644
index 4c95a5985..000000000
--- a/group_vars/realm.yml.sample
+++ /dev/null
@@ -1,15 +0,0 @@
-#rgw_realm: usa
-
-# the user should generate a new pair of keys for each realm
-
-#system_access_key: 6kWkikvapSnHyE22P7nO
-#system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt
-
-#rgw_realm_system_user: bostonian
-#rgw_realm_system_user_display_name: "Mark Wahlberg"
-
-# The variables rgw_pull_port, rgw_pull_proto, rgw_pullhost, are what comprise one of the rgw endpoints in a master zone in the zonegroup and realm you want to create secondary zones in.
-
-#rgw_pull_port: "{{ radosgw_frontend_port }}"
-#rgw_pull_proto: "http"
-#rgw_pullhost: localhost
diff --git a/group_vars/zone.yml.sample b/group_vars/zone.yml.sample
deleted file mode 100644
index f53282f71..000000000
--- a/group_vars/zone.yml.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-#rgw_zone: boston
-
-# Both rgw_zonemaster and rgw_zonesecondary must be set and they cannot have the same value
-
-#rgw_zonemaster: true
-#rgw_zonesecondary: false
-
-#rgw_zonegroup: massachusetts
-
-# The variable rgw_zonegroupmaster specifies the zonegroup will be the master zonegroup in a realm. There can only be one master zonegroup in a realm
-
-#rgw_zonegroupmaster: true
diff --git a/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 b/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2
index 416213782..cf032885f 100644
--- a/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2
+++ b/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2
@@ -76,7 +76,7 @@ for ((i=0; i<${RGW_NUMS}; i++)); do
   # First, restart the daemon
 
   # Check if systemd unit exists
-  # This is needed for new instances are the restart might trigger before the deployment
+  # This is needed for new instances as the restart might trigger before the deployment
   if systemctl list-units --full --all | grep -q "ceph-radosgw@rgw.${HOST_NAME}.${INSTANCES_NAME[i]}"; then
     systemctl restart ceph-radosgw@rgw.${HOST_NAME}.${INSTANCES_NAME[i]}
   else
diff --git a/roles/ceph-validate/tasks/check_rgw_multisite.yml b/roles/ceph-validate/tasks/check_rgw_multisite.yml
deleted file mode 100644
index 7679cd86f..000000000
--- a/roles/ceph-validate/tasks/check_rgw_multisite.yml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-- name: Fail if rgw_zone is default
-  ansible.builtin.fail:
-    msg: "rgw_zone cannot be named 'default'"
-  loop: "{{ rgw_instances }}"
-  when: item.rgw_zone is undefined or item.rgw_zone == 'default'
-
-- name: Fail if either rgw_zonemaster or rgw_zonesecondary is undefined
-  ansible.builtin.fail:
-    msg: "rgw_zonemaster and rgw_zonesecondary must be defined"
-  loop: "{{ rgw_instances }}"
-  when: item.rgw_zonemaster | default(rgw_zonemaster) is undefined or item.rgw_zonesecondary | default(rgw_zonesecondary) is undefined
-
-- name: Fail if rgw_zonemaster and rgw_zonesecondary are both true
-  ansible.builtin.fail:
-    msg: "rgw_zonemaster and rgw_zonesecondary cannot both be true"
-  loop: "{{ rgw_instances }}"
-  when:
-    - item.rgw_zonemaster | default(rgw_zonemaster) | bool
-    - item.rgw_zonesecondary | default(rgw_zonesecondary) | bool
-
-- name: Fail if rgw_zonegroup is not set
-  ansible.builtin.fail:
-    msg: "rgw_zonegroup has not been set by the user"
-  loop: "{{ rgw_instances }}"
-  when: item.rgw_zonegroup is undefined
-
-- name: Fail if rgw_zone_user is not set
-  ansible.builtin.fail:
-    msg: "rgw_zone_user has not been set by the user"
-  loop: "{{ rgw_instances }}"
-  when: item.rgw_zone_user is undefined
-
-- name: Fail if rgw_zone_user_display_name is not set
-  ansible.builtin.fail:
-    msg: "rgw_zone_user_display_name has not been set by the user"
-  loop: "{{ rgw_instances }}"
-  when: item.rgw_zone_user_display_name is undefined
-
-- name: Fail if rgw_realm is not set
-  ansible.builtin.fail:
-    msg: "rgw_realm has not been set by the user"
-  loop: "{{ rgw_instances }}"
-  when: item.rgw_realm is undefined
-
-- name: Fail if system_access_key is not set
-  ansible.builtin.fail:
-    msg: "system_access_key has not been set by the user"
-  loop: "{{ rgw_instances }}"
-  when: item.system_access_key is undefined
-
-- name: Fail if system_secret_key is not set
-  ansible.builtin.fail:
-    msg: "system_secret_key has not been set by the user"
-  loop: "{{ rgw_instances }}"
-  when: item.system_secret_key is undefined
-
-- name: Fail if endpoint is not set
-  ansible.builtin.fail:
-    msg: "endpoint has not been set by the user"
-  loop: "{{ rgw_instances }}"
-  when:
-    - item.rgw_zonesecondary | default(rgw_zonesecondary) | bool
-    - rgw_pull_port is undefined and rgw_pullhost is undefined and item.rgw_pull_proto | default(rgw_pull_proto) is undefined
-    - item.endpoint is undefined