From f56d8e58badf84e407e9c3ee45a6baf17f928560 Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Fri, 25 Nov 2016 14:41:38 +0000 Subject: [PATCH] Revert "updating-deprecated-ansible-modules" check_mode option is included in Ansible 2.2. Using in our playbooks mean that any other version before Ansible 2.2 can be used This reverts commit 529f202d00e4615caa1fcb447aaa47fde6aa1417. Change-Id: I3af96290443d760346264e6d994fd2a44de65543 Closes-Bug: #1644828 --- 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 a5ec39d4c1..e145b0c3cf 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 - check_mode: no + always_run: True run_once: True - name: Creating temp file on localhost local_action: copy content=None dest=/tmp/kolla_ceph_cluster mode=0644 changed_when: False - check_mode: no + always_run: True 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 - check_mode: no + always_run: True 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 - check_mode: no + always_run: True 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 efca14ee08..fefc9d325b 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 - check_mode: no + always_run: True run_once: True - name: Creating temp file on localhost local_action: copy content=None dest=/tmp/kolla_mariadb_cluster mode=0644 changed_when: False - check_mode: no + always_run: True 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 - check_mode: no + always_run: True 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 - check_mode: no + always_run: True run_once: True diff --git a/ansible/roles/mariadb/tasks/recover_cluster.yml b/ansible/roles/mariadb/tasks/recover_cluster.yml index bf62a85f4c..f45b907cb3 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 - check_mode: no + always_run: true - name: Cleaning up temp file on localhost local_action: file path=/tmp/kolla_mariadb_recover_inventory_name state=absent changed_when: false - check_mode: no + always_run: true 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 - check_mode: no + always_run: true - name: Cleaning up temp file on localhost local_action: file path=/tmp/kolla_mariadb_recover_inventory_name state=absent changed_when: false - check_mode: no + always_run: true run_once: true - name: Starting first MariaDB container