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