From: James Saint-Rossy <james_saintrossy@cable.comcast.com>
Date: Wed, 10 Aug 2016 22:03:09 +0000 (-0400)
Subject: code cleanup
X-Git-Tag: v1.0.6~19^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=052e4cc6876d6101088acc1244a0769dafb0adcc;p=ceph-ansible.git

code cleanup
---

diff --git a/roles/ceph-rgw/handlers/multisite.yml b/roles/ceph-rgw/handlers/multisite.yml
deleted file mode 100644
index ccb822659..000000000
--- a/roles/ceph-rgw/handlers/multisite.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: update period
-  command: radosgw-admin period update --commit
diff --git a/roles/ceph-rgw/tasks/multisite/secondary.yml b/roles/ceph-rgw/tasks/multisite/secondary.yml
index 3c53f63cd..fac7a703b 100644
--- a/roles/ceph-rgw/tasks/multisite/secondary.yml
+++ b/roles/ceph-rgw/tasks/multisite/secondary.yml
@@ -1,67 +1,34 @@
 ---
-- name: Check if the realm already exists
-  command: radosgw-admin realm get --rgw-realm={{ rgw_realm }}
-  register: realmcheck
-  failed_when: False
-  changed_when: False
-
-- name: Create the realm
-  command: radosgw-admin realm create --rgw-realm={{ rgw_realm }} --default
-  run_once: true
-  when: ("No such file or directory" in realmcheck.stderr) and rgw_zonemaster
-  notify:
-    - update period
-
 - name: Fetch the realm (Secondary)
   command: radosgw-admin realm pull --url=http://{{ rgw_pullhost }}:8080 --access-key={{ system_access_key }} --secret={{ system_secret_key }}
   run_once: true
-  when: ("No such file or directory" in realmcheck.stderr) and rgw_zonesecondary
+  when: ("No such file or directory" in realmcheck.stderr)
   notify:
     - update period
 
 - name: Fetch the realm (Secondary)
   command: radosgw-admin period pull --url=http://{{ rgw_pullhost }}:8080 --access-key={{ system_access_key }} --secret={{ system_secret_key }}
   run_once: true
-  when: ("No such file or directory" in realmcheck.stderr) and rgw_zonesecondary
+  when: ("No such file or directory" in realmcheck.stderr)
   notify:
     - update period
 
-- name: Check if the zonegroup already exists
-  command: radosgw-admin zonegroup get --rgw-zonegroup={{ rgw_zonegroup }}
-  register: zonegroupcheck
-  failed_when: False
-  changed_when: False
-
-- name: Create the zonegroup 
-  command: radosgw-admin zonegroup create --rgw-zonegroup={{ rgw_zonegroup }} --endpoints=http://{{ ansible_hostname }}:8080 --master --default
+- name: Set default realm
+  command: radosgw-admin realm default --rgw-realm={{ rgw_realm }}
   run_once: true
-  when: ("No such file or directory" in zonegroupcheck.stderr) and rgw_zonemaster
   notify:
-    - update period
-
-- name: Check if the zone already exists
-  command: radosgw-admin zone get --rgw-zone={{ rgw_zone }}
-  register: zonecheck
-  failed_when: False
-  changed_when: False
+    - update period # Might not need to update period here
 
-- name: Create the zone
-  command: radosgw-admin zone create --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} --endpoints=http://{{ ansible_hostname }}:8080 --access-key={{ system_access_key }} --secret={{ system_secret_key }} --default --master
+- name: Set default zonegroup
+  command: radosgw-admin zonegroup default --rgw-zonegroup={{ rgw_zonegroup }}
   run_once: true
-  when: ("No such file or directory" in zonecheck.stderr) and rgw_zonemaster
   notify:
-    - update period
-
-- name: Check if the system user already exists
-  command: radosgw-admin user info --uid=zone.user
-  register: usercheck
-  failed_when: False
-  changed_when: False
+    - update period # Might not need to update period here
 
-- name: Create the zone user
-  command: radosgw-admin user create --uid=zone.user --display-name="Zone User" --access-key={{ system_access_key }} --secret={{ system_secret_key }} --system
+- name: Create the zone
+  command: radosgw-admin zone create --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} --endpoints=http://{{ ansible_hostname }}:8080 --access-key={{ system_access_key }} --secret={{ system_secret_key }} --default
   run_once: true
-  when: "'could not fetch user info: no user info saved' in usercheck.stderr"
+  when: ("No such file or directory" in zonecheck.stderr)
   notify:
     - update period