From 191e2685756b3a96102dc7f1786a918f1ed3e12c Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@gmail.com>
Date: Thu, 31 Aug 2017 22:15:32 +0200
Subject: [PATCH] Fix warning on {failed|changed}_when statements
Ansible 2.3.0 does not like delimiters in when statement.
Related link: https://github.com/ansible/ansible/issues/22397
Closes-Bug: #1714349
Change-Id: I973cc6537c4c1374546b5cddb4ce713a553b92f4
---
ansible/roles/barbican/tasks/check.yml | 2 +-
ansible/roles/ceph/tasks/bootstrap_osds.yml | 2 +-
ansible/roles/ceph/tasks/reconfigure.yml | 2 +-
ansible/roles/swift/tasks/check.yml | 2 +-
ansible/roles/swift/tasks/start.yml | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ansible/roles/barbican/tasks/check.yml b/ansible/roles/barbican/tasks/check.yml
index ede5e1be0c..9148f763bd 100644
--- a/ansible/roles/barbican/tasks/check.yml
+++ b/ansible/roles/barbican/tasks/check.yml
@@ -18,7 +18,7 @@
--os-project-name={{ openstack_auth.project_name }} \
secret get -f value -p {{ barbican_store_secret.stdout }}
register: barbican_get_secret
- failed_when: "{{ barbican_get_secret.stdout != 'kolla' }}"
+ failed_when: barbican_get_secret.stdout != 'kolla'
run_once: True
when: kolla_enable_sanity_barbican | bool
diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml
index 2bff0cfc69..24f2af12d8 100644
--- a/ansible/roles/ceph/tasks/bootstrap_osds.yml
+++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml
@@ -4,7 +4,7 @@
-m find_disks
-a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP' match_mode='prefix' use_udev={{ kolla_ceph_use_udev }}"
register: osd_lookup
- changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
+ changed_when: osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS'
- name: Parsing disk info for Ceph OSDs
diff --git a/ansible/roles/ceph/tasks/reconfigure.yml b/ansible/roles/ceph/tasks/reconfigure.yml
index 2c8c6cabe2..090745fb74 100644
--- a/ansible/roles/ceph/tasks/reconfigure.yml
+++ b/ansible/roles/ceph/tasks/reconfigure.yml
@@ -14,7 +14,7 @@
-m find_disks
-a "partition_name='KOLLA_CEPH_DATA' match_mode='prefix' use_udev={{ kolla_ceph_use_udev }}"
register: osd_lookup
- changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
+ changed_when: osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS'
when: inventory_hostname in groups['ceph-osd']
diff --git a/ansible/roles/swift/tasks/check.yml b/ansible/roles/swift/tasks/check.yml
index 9b40ebe4ef..e7e9a5d811 100644
--- a/ansible/roles/swift/tasks/check.yml
+++ b/ansible/roles/swift/tasks/check.yml
@@ -11,7 +11,7 @@
auth={{ '{{ openstack_swift_auth }}' }}"
-e "{'openstack_swift_auth':{{ openstack_swift_auth }}}"
register: swift_sanity
- changed_when: "{{ swift_sanity.stdout.find('localhost | SUCCESS => ') != -1 and (swift_sanity.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
+ changed_when: swift_sanity.stdout.find('localhost | SUCCESS => ') != -1 and (swift_sanity.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
until: swift_sanity.stdout.split()[2] == 'SUCCESS'
retries: 10
delay: 5
diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml
index 442c3a7515..4b21401d51 100644
--- a/ansible/roles/swift/tasks/start.yml
+++ b/ansible/roles/swift/tasks/start.yml
@@ -5,8 +5,8 @@
-a "name={{ swift_devices_name }}
match_mode={{ swift_devices_match_mode }}"
register: swift_disk_lookup
- changed_when: "{{ swift_disk_lookup.stdout.find('localhost | SUCCESS => ') != -1 and
- (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
+ changed_when: swift_disk_lookup.stdout.find('localhost | SUCCESS => ') != -1 and
+ (swift_disk_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
failed_when: swift_disk_lookup.stdout.split()[2] != 'SUCCESS'
when: inventory_hostname in groups['swift-account-server'] or
inventory_hostname in groups['swift-container-server'] or