aboutsummaryrefslogtreecommitdiffstats
path: root/meta-openstack
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2014-07-28 11:29:56 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-07-31 15:15:31 -0400
commit9dc8b721c41b0b547e064ca36cf398f8e53c58a9 (patch)
treebaa2361c706f3eb3b45a65dfdca06d7bc0ced924 /meta-openstack
parent1d1bcd7da7e8606db6d2021a3413638267b96714 (diff)
downloadmeta-cloud-services-9dc8b721c41b0b547e064ca36cf398f8e53c58a9.tar.gz
meta-cloud-services-9dc8b721c41b0b547e064ca36cf398f8e53c58a9.tar.bz2
meta-cloud-services-9dc8b721c41b0b547e064ca36cf398f8e53c58a9.zip
aio: add support for identity.bbclass
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r--meta-openstack/classes/identity.bbclass2
-rw-r--r--meta-openstack/recipes-extended/images/openstack-image-aio.bb3
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 57f4249..73e7724 100644
--- a/meta-openstack/recipes-extended/images/openstack-image-aio.bb
+++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb
@@ -23,7 +23,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"
+