diff --git a/playbooks/inventory/group_vars/swift_all.yml b/playbooks/inventory/group_vars/swift_all.yml
index a153102e67..50b4c401ac 100644
--- a/playbooks/inventory/group_vars/swift_all.yml
+++ b/playbooks/inventory/group_vars/swift_all.yml
@@ -20,4 +20,4 @@ swift_service_in_ldap: "{{ service_ldap_backend_enabled }}"
 swift_package_state: "{{ package_state }}"
 
 # Used to optionally filter Gnocchi-originated traffic in Ceilometermiddleware
-swift_gnocchi_enabled: "{{ groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0 }}"
+swift_gnocchi_enabled: "{{ (groups['gnocchi_all'] is defined and groups['gnocchi_all'] | length > 0) }}"
diff --git a/playbooks/setup-openstack.yml b/playbooks/setup-openstack.yml
index db1db4b447..c4cf8b8202 100644
--- a/playbooks/setup-openstack.yml
+++ b/playbooks/setup-openstack.yml
@@ -22,6 +22,13 @@
 - include: os-horizon-install.yml
 - include: os-ceilometer-install.yml
 - include: os-aodh-install.yml
+#NOTE(stevelle) Ensure Gnocchi identities exist before Swift
+- include: os-gnocchi-install.yml
+  when:
+    - gnocchi_storage_driver is defined
+    - gnocchi_storage_driver == 'swift'
+  vars:
+    gnocchi_identity_only: True
 - include: os-swift-install.yml
 - include: os-gnocchi-install.yml
 - include: os-ironic-install.yml