2 files changed, 4 insertions, 1 deletions

diff --git a/meta-openstack/classes/identity.bbclass b/meta-openstack/classes/identity.bbclass
index 424d946..ad68108 100644
--- a/meta-openstack/classes/identity.bbclass
+++ b/meta-openstack/classes/identity.bbclass
@@ -39,7 +39,7 @@ if [ -f ${POST_SERVICE_SETUP_COMMAND} ]; then
 fi
 
 # run hybrid backend setup
-if [ -f ${POST_KEYSTONE_SETUP_COMMAND} ]; then
+if [ -f "${POST_KEYSTONE_SETUP_COMMAND}" ]; then
     chmod 755 ${POST_KEYSTONE_SETUP_COMMAND}
     ${POST_KEYSTONE_SETUP_COMMAND}
 fi
diff --git a/meta-openstack/recipes-extended/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb
index 5468330..3aff066 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-aio.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb
@@ -24,7 +24,10 @@ IMAGE_FEATURES += "ssh-server-openssh"
 
 inherit core-image
 inherit openstack-base
+inherit identity
 
 # check for 5G of free space, so we use 5G as a starting point.
 IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000"
 
+POST_KEYSTONE_SETUP_COMMAND = "/etc/keystone/hybrid-backend-setup"
+