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.

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index f255ef5deca1331bc4586b90f3f6cb677f527ffa..f2d33f4675f148832c62905a5c8f8b280a4a70a2 100644 (file)
--- 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 ed527c25909a3defb0ce56eb50fdd639c8d21852..a25be33d42548fa2ec77295bb405b0c6eb83be34 100644 (file)
--- 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