From 4b29b2707f8e8218150035e78b6e9c68777e194b Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 26 Feb 2016 15:39:27 -0600 Subject: [PATCH] Fix openstack config skipping Previously, creating pools was skipped if cephx was disabled; instead, we should only skip key creation if cephx is disabled, and create pools any time openstack_config is true. --- roles/ceph-mon/tasks/ceph_keys.yml | 4 +--- roles/ceph-mon/tasks/openstack_config.yml | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml index f255ef5de..f2d33f467 100644 --- a/roles/ceph-mon/tasks/ceph_keys.yml +++ b/roles/ceph-mon/tasks/ceph_keys.yml @@ -15,9 +15,7 @@ groups[restapi_group_name] is defined - include: openstack_config.yml - when: - openstack_config and - cephx + when: openstack_config - name: find ceph keys shell: ls -1 /etc/ceph/*.keyring diff --git a/roles/ceph-mon/tasks/openstack_config.yml b/roles/ceph-mon/tasks/openstack_config.yml index ed527c259..a25be33d4 100644 --- a/roles/ceph-mon/tasks/openstack_config.yml +++ b/roles/ceph-mon/tasks/openstack_config.yml @@ -15,3 +15,4 @@ creates: /etc/ceph/ceph.{{ item.name }}.keyring with_items: openstack_keys changed_when: false + when: cephx -- 2.47.3