From 66411cbafb6631c1a5c5ca5d0e9335560f0b74c0 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 3 Jun 2020 15:35:45 +0200 Subject: [PATCH] Remove swift sanity check Currently swift sanity check relies on kolla_sanity.py module, which uses shade. It only authenticates to keystone and declares SUCCESS - which is a bit useless. This change removes Swift sanity check, so kolla_sanity.py can be removed in Kolla. We agreed on PTG to replace sanity checks with something useful, so that functionality will be reintroduced with a different mechanism. Change-Id: Ib86ec61136f4b0039d4f31829d7b579f34d7e6cb --- ansible/group_vars/all.yml | 1 - ansible/roles/swift/tasks/check.yml | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 0d7c8362ac..0d2a7460b5 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -44,7 +44,6 @@ kolla_enable_sanity_barbican: "{{ kolla_enable_sanity_checks }}" kolla_enable_sanity_keystone: "{{ kolla_enable_sanity_checks }}" kolla_enable_sanity_glance: "{{ kolla_enable_sanity_checks }}" kolla_enable_sanity_cinder: "{{ kolla_enable_sanity_checks }}" -kolla_enable_sanity_swift: "{{ kolla_enable_sanity_checks }}" kolla_dev_repos_directory: "/opt/stack/" kolla_dev_repos_git: "https://opendev.org/openstack" diff --git a/ansible/roles/swift/tasks/check.yml b/ansible/roles/swift/tasks/check.yml index 9259f2dbf1..ed97d539c0 100644 --- a/ansible/roles/swift/tasks/check.yml +++ b/ansible/roles/swift/tasks/check.yml @@ -1,21 +1 @@ --- -- name: Swift sanity checks - become: true - command: docker exec -t kolla_toolbox ansible localhost - -m kolla_sanity - -a "service=swift - project=service - user={{ openstack_auth.username }} - password={{ swift_keystone_password }} - role=admin - region_name={{ openstack_region_name }} - auth={{ '{{ openstack_swift_auth }}' }} - {% if openstack_cacert != '' %}cacert={{ openstack_cacert }}{% endif %}" - -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 - until: swift_sanity.stdout.split()[2] == 'SUCCESS' - retries: 10 - delay: 5 - run_once: True - when: kolla_enable_sanity_swift | bool