From e3ddc4e4ef3037ba7fe81b20b520d67404418ce0 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 14 Nov 2016 14:57:54 +0800 Subject: Use check_mode no instead of always_run Change-Id: If42f9ec1a2371982a47f7fe8269fe39d65c599cf Closes-Bug: #1640247 --- ansible/roles/ceph/tasks/bootstrap_mons.yml | 8 ++++---- ansible/roles/mariadb/tasks/lookup_cluster.yml | 8 ++++---- ansible/roles/mariadb/tasks/recover_cluster.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ansible/roles/ceph/tasks/bootstrap_mons.yml b/ansible/roles/ceph/tasks/bootstrap_mons.yml index e145b0c3c..a5ec39d4c 100644 --- a/ansible/roles/ceph/tasks/bootstrap_mons.yml +++ b/ansible/roles/ceph/tasks/bootstrap_mons.yml @@ -2,13 +2,13 @@ - name: Cleaning up temp file on localhost local_action: file path=/tmp/kolla_ceph_cluster state=absent changed_when: False - always_run: True + check_mode: no run_once: True - name: Creating temp file on localhost local_action: copy content=None dest=/tmp/kolla_ceph_cluster mode=0644 changed_when: False - always_run: True + check_mode: no run_once: True - name: Creating ceph_mon_config volume @@ -21,7 +21,7 @@ - name: Writing hostname of host with existing cluster files to temp file local_action: copy content="{{ inventory_hostname }}" dest=/tmp/kolla_ceph_cluster mode=0644 changed_when: False - always_run: True + check_mode: no when: not ceph_mon_config_volume.changed - name: Registering host from temp file @@ -31,7 +31,7 @@ - name: Cleaning up temp file on localhost local_action: file path=/tmp/kolla_ceph_cluster state=absent changed_when: False - always_run: True + check_mode: no run_once: True - include: generate_cluster.yml diff --git a/ansible/roles/mariadb/tasks/lookup_cluster.yml b/ansible/roles/mariadb/tasks/lookup_cluster.yml index fefc9d325..efca14ee0 100644 --- a/ansible/roles/mariadb/tasks/lookup_cluster.yml +++ b/ansible/roles/mariadb/tasks/lookup_cluster.yml @@ -2,13 +2,13 @@ - name: Cleaning up temp file on localhost local_action: file path=/tmp/kolla_mariadb_cluster state=absent changed_when: False - always_run: True + check_mode: no run_once: True - name: Creating temp file on localhost local_action: copy content=None dest=/tmp/kolla_mariadb_cluster mode=0644 changed_when: False - always_run: True + check_mode: no run_once: True - name: Creating mariadb volume @@ -21,7 +21,7 @@ - name: Writing hostname of host with existing cluster files to temp file local_action: copy content={{ ansible_hostname }} dest=/tmp/kolla_mariadb_cluster mode=0644 changed_when: False - always_run: True + check_mode: no when: not mariadb_volume | changed - name: Registering host from temp file @@ -31,5 +31,5 @@ - name: Cleaning up temp file on localhost local_action: file path=/tmp/kolla_mariadb_cluster state=absent changed_when: False - always_run: True + check_mode: no run_once: True diff --git a/ansible/roles/mariadb/tasks/recover_cluster.yml b/ansible/roles/mariadb/tasks/recover_cluster.yml index f45b907cb..bf62a85f4 100644 --- a/ansible/roles/mariadb/tasks/recover_cluster.yml +++ b/ansible/roles/mariadb/tasks/recover_cluster.yml @@ -17,12 +17,12 @@ - name: Cleaning up temp file on mariadb hosts file: path=/tmp/kolla_mariadb_grastate.dat state=absent changed_when: false - always_run: true + check_mode: no - name: Cleaning up temp file on localhost local_action: file path=/tmp/kolla_mariadb_recover_inventory_name state=absent changed_when: false - always_run: true + check_mode: no run_once: true - block: @@ -60,12 +60,12 @@ - name: Cleaning up temp file on mariadb hosts file: path=/tmp/kolla_mariadb_grastate.dat state=absent changed_when: false - always_run: true + check_mode: no - name: Cleaning up temp file on localhost local_action: file path=/tmp/kolla_mariadb_recover_inventory_name state=absent changed_when: false - always_run: true + check_mode: no run_once: true - name: Starting first MariaDB container -- cgit v1.2.3