From 25857889828670099438b999ae9d2bf7f931596e Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 14 Oct 2019 14:07:13 +0200 Subject: [PATCH] Use versioned python binary with fetch ceph keyrings Depends-On: https://review.opendev.org/688636/ Change-Id: I9918ff6a91acde2a7d184e44b8a1014462596e39 --- ansible/roles/ceph/tasks/deploy.yml | 1 + ansible/roles/ceph/tasks/distribute_keyrings.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/roles/ceph/tasks/deploy.yml b/ansible/roles/ceph/tasks/deploy.yml index 869be9d419..d4c4a90911 100644 --- a/ansible/roles/ceph/tasks/deploy.yml +++ b/ansible/roles/ceph/tasks/deploy.yml @@ -7,6 +7,7 @@ when: inventory_hostname in groups['ceph-mon'] - include_tasks: distribute_keyrings.yml + when: kolla_action != "upgrade" - include_tasks: start_mons.yml when: inventory_hostname in groups['ceph-mon'] diff --git a/ansible/roles/ceph/tasks/distribute_keyrings.yml b/ansible/roles/ceph/tasks/distribute_keyrings.yml index 418ac6b547..9327347c65 100644 --- a/ansible/roles/ceph/tasks/distribute_keyrings.yml +++ b/ansible/roles/ceph/tasks/distribute_keyrings.yml @@ -1,7 +1,7 @@ --- - name: Fetching Ceph keyrings become: true - command: docker exec ceph_mon fetch_ceph_keys.py + command: docker exec ceph_mon /usr/bin/python{{ distro_python_version }} /usr/bin/fetch_ceph_keys.py register: ceph_files_json changed_when: (ceph_files_json.stdout | from_json).changed failed_when: (ceph_files_json.stdout | from_json).failed