Merge pull request #571 from stpierre/fix-openstack-config-skip

Fix openstack config skipping
2016-02-27 00:40:03 +01:00 · 2016-02-27 00:40:03 +01:00 · 81b544a240
parent e9f3e792b0 4b29b2707f
commit 81b544a240
2 changed files with 2 additions and 3 deletions
--- 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
--- 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