From bdf648ff2003388bbb38c5e6dc4806391809283f Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 15 Jun 2020 11:58:36 +0000 Subject: [PATCH] Revert "Add osd blacklist cap when openstack client cap is built" Explicit allowance for command blacklist shouldn't be necessary in master nor ussuri/train as per [1] and, more in general, shouldn't ever be needed with "profile rbd" It seems a problem seen when upgrading from jewel to luminous, for tripleo that means upgrading from newton to queens; the changes are for the jewel keyring so I think the patch should be posted for the newton branch only 1. https://bugzilla.redhat.com/show_bug.cgi?id=1838145#c25 This reverts commit 4421bf805664d2716a114ed5cc2f9f11d3e99ae8. Change-Id: I151a1b8d0f2775463580f46082aa22469878dc15 --- .../roles/tripleo_ceph_work_dir/tasks/build_keys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/build_keys.yml b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/build_keys.yml index 903649f55..db18a2be6 100644 --- a/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/build_keys.yml +++ b/tripleo_ansible/roles/tripleo_ceph_work_dir/tasks/build_keys.yml @@ -29,7 +29,7 @@ - name: set openstack client caps set_fact: - osp_client_caps: {'mgr': 'allow *', 'mon': 'profile rbd, allow command "osd blacklist"', 'osd': "{{ profiles | regex_replace('\\, $', '') }}"} + osp_client_caps: {'mgr': 'allow *', 'mon': 'profile rbd', 'osd': "{{ profiles | regex_replace('\\, $', '') }}"} - name: set openstack client key set_fact: