summaryrefslogtreecommitdiffstats
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-30 10:46:56 -0400
commit68efec575d16617e9ff7f969df8d1f9388ab61f8 (patch)
tree488b3ffb99aee1cb3fc40605ca053105208b5606
parentdc1789ae460f3fdf036f101ce9983c52d0b5a80f (diff)
downloadmeta-cloud-services-68efec575d16617e9ff7f969df8d1f9388ab61f8.tar.gz
aio: add support for identity.bbclass
Signed-off-by: Amy Fong <amy.fong@windriver.com>
-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
39fi 39fi
40 40
41# run hybrid backend setup 41# run hybrid backend setup
42if [ -f ${POST_KEYSTONE_SETUP_COMMAND} ]; then 42if [ -f "${POST_KEYSTONE_SETUP_COMMAND}" ]; then
43 chmod 755 ${POST_KEYSTONE_SETUP_COMMAND} 43 chmod 755 ${POST_KEYSTONE_SETUP_COMMAND}
44 ${POST_KEYSTONE_SETUP_COMMAND} 44 ${POST_KEYSTONE_SETUP_COMMAND}
45fi 45fi
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"
24 24
25inherit core-image 25inherit core-image
26inherit openstack-base 26inherit openstack-base
27inherit identity
27 28
28# check for 5G of free space, so we use 5G as a starting point. 29# check for 5G of free space, so we use 5G as a starting point.
29IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" 30IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000"
30 31
32POST_KEYSTONE_SETUP_COMMAND = "/etc/keystone/hybrid-backend-setup"
33