From b11dc13476382bc6410d8b71805ee2cafc851161 Mon Sep 17 00:00:00 2001 From: Kevin Coakley Date: Fri, 1 Mar 2019 10:53:03 -0800 Subject: [PATCH] Updated 7 ansible-lint issues in the ceph-mon, ceph-osd, and ceph-rgw roles The following lint issues have been resolved: [301] Commands should not change things if nothing needs doing /home/travis/build/ceph/ceph-ansible/roles/ceph-mon/tasks/ceph_keys.yml:2 [305] Use shell only when shell functionality is required /home/travis/build/ceph/ceph-ansible/roles/ceph-osd/tasks/start_osds.yml:47 [301] Commands should not change things if nothing needs doing /home/travis/build/ceph/ceph-ansible/roles/ceph-rgw/tasks/multisite/destroy.yml:2 [301] Commands should not change things if nothing needs doing /home/travis/build/ceph/ceph-ansible/roles/ceph-rgw/tasks/multisite/destroy.yml:7 [301] Commands should not change things if nothing needs doing /home/travis/build/ceph/ceph-ansible/roles/ceph-rgw/tasks/multisite/destroy.yml:14 [301] Commands should not change things if nothing needs doing /home/travis/build/ceph/ceph-ansible/roles/ceph-rgw/tasks/multisite/destroy.yml:19 [301] Commands should not change things if nothing needs doing /home/travis/build/ceph/ceph-ansible/roles/ceph-rgw/tasks/multisite/destroy.yml:24 Signed-off-by: Kevin Coakley --- roles/ceph-mon/tasks/ceph_keys.yml | 1 + roles/ceph-osd/tasks/start_osds.yml | 3 +-- roles/ceph-rgw/tasks/multisite/destroy.yml | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml index 85b169f44..ab2c699f1 100644 --- a/roles/ceph-mon/tasks/ceph_keys.yml +++ b/roles/ceph-mon/tasks/ceph_keys.yml @@ -14,6 +14,7 @@ (ceph_health_raw.stdout | default('{}') | from_json)['state'] in ['leader', 'peon'] retries: "{{ handler_health_mon_check_retries }}" delay: "{{ handler_health_mon_check_delay }}" + changed_when: false - name: fetch ceph initial keys ceph_key: diff --git a/roles/ceph-osd/tasks/start_osds.yml b/roles/ceph-osd/tasks/start_osds.yml index 10e755df6..740f73912 100644 --- a/roles/ceph-osd/tasks/start_osds.yml +++ b/roles/ceph-osd/tasks/start_osds.yml @@ -45,8 +45,7 @@ docker_exec_start_osd: "{{ '{{ container_binary }} run --rm --net=host --privileged=true -v /var/run/udev/:/var/run/udev/:z -v /run/lvm/:/run/lvm/ -v /etc/ceph:/etc/ceph:z -v /dev:/dev --entrypoint=ceph-volume ' + ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else 'ceph-volume' }}" - name: collect osd ids - shell: > - {{ docker_exec_start_osd }} lvm list --format json + command: "{{ docker_exec_start_osd }} lvm list --format json" changed_when: false failed_when: false register: ceph_osd_ids diff --git a/roles/ceph-rgw/tasks/multisite/destroy.yml b/roles/ceph-rgw/tasks/multisite/destroy.yml index 6054e7c0f..82342e269 100644 --- a/roles/ceph-rgw/tasks/multisite/destroy.yml +++ b/roles/ceph-rgw/tasks/multisite/destroy.yml @@ -3,11 +3,15 @@ command: radosgw-admin user rm --uid=zone.user run_once: true failed_when: false + register: rgw_delete_the_zone_user + changed_when: rgw_delete_the_zone_user.rc == 0 - name: remove zone from zonegroup command: radosgw-admin zonegroup remove --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} run_once: true failed_when: false + register: rgw_remove_zone_from_zonegroup + changed_when: rgw_remove_zone_from_zonegroup.rc == 0 notify: - update period @@ -15,16 +19,22 @@ command: radosgw-admin zone delete --rgw-zonegroup={{ rgw_zonegroup }} --rgw-zone={{ rgw_zone }} run_once: true failed_when: false + register: rgw_delete_the_zone + changed_when: rgw_delete_the_zone.rc == 0 - name: delete the zonegroup command: radosgw-admin zonegroup delete --rgw-zonegroup={{ rgw_zonegroup }} run_once: true failed_when: false + register: rgw_delete_the_zonegroup + changed_when: rgw_delete_the_zonegroup.rc == 0 - name: delete the realm command: radosgw-admin realm delete --rgw-realm={{ rgw_realm }} run_once: true failed_when: false + register: rgw_delete_the_realm + changed_when: rgw_delete_the_realm.rc == 0 - name: delete zone from rgw stanza in ceph.conf lineinfile: -- 2.39.5