From 53972ee67232ef2239d7e864b2dd93095a634b8f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 30 Oct 2018 15:51:32 +0100 Subject: [PATCH] lint: add changed_when to command MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Calling command should have changed_when false otherwise each time it runs it will show as 'changed' and this is irrelevant. Commands should not change things if nothing needs doing Signed-off-by: Sébastien Han --- roles/ceph-common/tasks/facts_mon_fsid.yml | 1 + roles/ceph-docker-common/tasks/fetch_image.yml | 5 ++++- roles/ceph-mds/tasks/containerized.yml | 1 + roles/ceph-mgr/tasks/main.yml | 1 + roles/ceph-mon/tasks/docker/main.yml | 1 + roles/ceph-mon/tasks/secure_cluster.yml | 2 ++ roles/ceph-osd/tasks/openstack_config.yml | 1 + roles/ceph-rbd-mirror/tasks/configure_mirroring.yml | 3 ++- roles/ceph-rgw/tasks/multisite/secondary.yml | 2 ++ roles/ceph-rgw/tasks/openstack-keystone.yml | 5 ++++- 10 files changed, 19 insertions(+), 3 deletions(-) diff --git a/roles/ceph-common/tasks/facts_mon_fsid.yml b/roles/ceph-common/tasks/facts_mon_fsid.yml index 8b6bc2a4e..ebb1a8a1b 100644 --- a/roles/ceph-common/tasks/facts_mon_fsid.yml +++ b/roles/ceph-common/tasks/facts_mon_fsid.yml @@ -19,6 +19,7 @@ - name: test existing initial mon keyring command: ceph --connect-timeout 3 --cluster {{ cluster }} --keyring /var/lib/ceph/mon/{{ cluster }}-{{ monitor_name }}/keyring -n mon. fsid + changed_when: false register: test_initial_monitor_keyring ignore_errors: true diff --git a/roles/ceph-docker-common/tasks/fetch_image.yml b/roles/ceph-docker-common/tasks/fetch_image.yml index 0fccd4a34..0144709fc 100644 --- a/roles/ceph-docker-common/tasks/fetch_image.yml +++ b/roles/ceph-docker-common/tasks/fetch_image.yml @@ -188,6 +188,7 @@ - name: "inspecting {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} image after pulling" command: "docker inspect {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" + changed_when: false failed_when: false register: image_inspect_after_pull @@ -295,6 +296,8 @@ - (ceph_docker_dev_image is defined and ceph_docker_dev_image) - name: remove tmp ceph dev image file - command: "rm /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar" + file: + name: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar" + state: absent when: - (ceph_docker_dev_image is defined and ceph_docker_dev_image) diff --git a/roles/ceph-mds/tasks/containerized.yml b/roles/ceph-mds/tasks/containerized.yml index 50bfe679c..55b34fbd5 100644 --- a/roles/ceph-mds/tasks/containerized.yml +++ b/roles/ceph-mds/tasks/containerized.yml @@ -65,6 +65,7 @@ - name: wait for mds socket to exist command: "{{ docker_exec_cmd }} sh -c 'stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_hostname }}.asok || stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_fqdn }}.asok'" + changed_when: false register: multi_mds_socket retries: 5 delay: 15 diff --git a/roles/ceph-mgr/tasks/main.yml b/roles/ceph-mgr/tasks/main.yml index 9b5f1a41a..214a8efef 100644 --- a/roles/ceph-mgr/tasks/main.yml +++ b/roles/ceph-mgr/tasks/main.yml @@ -18,6 +18,7 @@ - name: get enabled modules from ceph-mgr command: "{{ docker_exec_cmd_mgr | default('') }} ceph --cluster {{ cluster }} --format json mgr module ls" + changed_when: false register: _ceph_mgr_modules delegate_to: "{{ groups[mon_group_name][0] }}" diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml index 898f31f55..abe6323ed 100644 --- a/roles/ceph-mon/tasks/docker/main.yml +++ b/roles/ceph-mon/tasks/docker/main.yml @@ -11,6 +11,7 @@ - name: wait for monitor socket to exist command: "{{ docker_exec_cmd }} sh -c 'stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_hostname }}.asok || stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_fqdn }}.asok'" + changed_when: false register: monitor_socket retries: 5 delay: 15 diff --git a/roles/ceph-mon/tasks/secure_cluster.yml b/roles/ceph-mon/tasks/secure_cluster.yml index d9c9ea3e9..bdce42946 100644 --- a/roles/ceph-mon/tasks/secure_cluster.yml +++ b/roles/ceph-mon/tasks/secure_cluster.yml @@ -1,11 +1,13 @@ --- - name: collect all the pools command: rados --cluster {{ cluster }} lspools + changed_when: false register: ceph_pools check_mode: no - name: secure the cluster command: ceph --cluster {{ cluster }} osd pool set {{ item[0] }} {{ item[1] }} true + changed_when: false with_nested: - "{{ ceph_pools.stdout_lines|default([]) }}" - "{{ secure_cluster_flags }}" diff --git a/roles/ceph-osd/tasks/openstack_config.yml b/roles/ceph-osd/tasks/openstack_config.yml index 71322d7b3..a4312068e 100644 --- a/roles/ceph-osd/tasks/openstack_config.yml +++ b/roles/ceph-osd/tasks/openstack_config.yml @@ -6,6 +6,7 @@ register: wait_for_all_osds_up retries: 30 delay: 10 + changed_when: false delegate_to: "{{ groups[mon_group_name][0] }}" until: wait_for_all_osds_up.rc == 0 diff --git a/roles/ceph-rbd-mirror/tasks/configure_mirroring.yml b/roles/ceph-rbd-mirror/tasks/configure_mirroring.yml index 66c32e19e..d93bd8e5d 100644 --- a/roles/ceph-rbd-mirror/tasks/configure_mirroring.yml +++ b/roles/ceph-rbd-mirror/tasks/configure_mirroring.yml @@ -1,3 +1,4 @@ --- - name: add a peer - shell: "rbd mirror pool peer add {{ ceph_rbd_mirror_pool }} {{ ceph_rbd_mirror_remote_user }}@{{ ceph_rbd_mirror_remote_cluster }}" + command: "rbd mirror pool peer add {{ ceph_rbd_mirror_pool }} {{ ceph_rbd_mirror_remote_user }}@{{ ceph_rbd_mirror_remote_cluster }}" + changed_when: false diff --git a/roles/ceph-rgw/tasks/multisite/secondary.yml b/roles/ceph-rgw/tasks/multisite/secondary.yml index 4353138cb..413749c9d 100644 --- a/roles/ceph-rgw/tasks/multisite/secondary.yml +++ b/roles/ceph-rgw/tasks/multisite/secondary.yml @@ -15,11 +15,13 @@ - name: set default realm command: "{{ docker_exec_cmd }} radosgw-admin realm default --rgw-realm={{ rgw_realm }}" + changed_when: false delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true - name: set default zonegroup command: "{{ docker_exec_cmd }} radosgw-admin zonegroup default --rgw-zonegroup={{ rgw_zonegroup }}" + changed_when: false delegate_to: "{{ groups[mon_group_name][0] }}" run_once: true diff --git a/roles/ceph-rgw/tasks/openstack-keystone.yml b/roles/ceph-rgw/tasks/openstack-keystone.yml index ab0653ec3..f1d64d9e3 100644 --- a/roles/ceph-rgw/tasks/openstack-keystone.yml +++ b/roles/ceph-rgw/tasks/openstack-keystone.yml @@ -23,6 +23,9 @@ - name: create nss entries for keystone certificates shell: "{{ item }}" + args: + warn: no + changed_when: false with_items: - - "openssl x509 -in /etc/keystone/ssl/certs/ca.pem -pubkey |certutil -d {{ radosgw_nss_db_path }} -A -n ca -t 'TCu,Cu,Tuw'" + - "openssl x509 -in /etc/keystone/ssl/certs/ca.pem -pubkey | certutil -d {{ radosgw_nss_db_path }} -A -n ca -t 'TCu,Cu,Tuw'" - "openssl x509 -in /etc/keystone/ssl/certs/signing_cert.pem -pubkey | certutil -A -d {{ radosgw_nss_db_path }} -n signing_cert -t 'P,P,P'" -- 2.39.5