diff options
| author | Amy Fong <amy.fong@windriver.com> | 2014-07-28 11:29:56 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-07-30 00:50:59 -0400 |
| commit | 3b59cc8c9564bbf8df07eb4bb8991d1a32ac9c78 (patch) | |
| tree | e701020b1a95c6ef573e77c5790b2578358dd4e9 | |
| parent | 3ee170f0a427dc7235c732d1e5383380bb5e190c (diff) | |
| download | meta-cloud-services-3b59cc8c9564bbf8df07eb4bb8991d1a32ac9c78.tar.gz | |
aio: add support for identity.bbclass
Signed-off-by: Amy Fong <amy.fong@windriver.com>
| -rw-r--r-- | meta-openstack/classes/identity.bbclass | 2 | ||||
| -rw-r--r-- | meta-openstack/recipes-extended/images/openstack-image-aio.bb | 3 |
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 | |||
| 39 | fi | 39 | fi |
| 40 | 40 | ||
| 41 | # run hybrid backend setup | 41 | # run hybrid backend setup |
| 42 | if [ -f ${POST_KEYSTONE_SETUP_COMMAND} ]; then | 42 | if [ -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} |
| 45 | fi | 45 | 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" | |||
| 24 | 24 | ||
| 25 | inherit core-image | 25 | inherit core-image |
| 26 | inherit openstack-base | 26 | inherit openstack-base |
| 27 | inherit 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. |
| 29 | IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" | 30 | IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" |
| 30 | 31 | ||
| 32 | POST_KEYSTONE_SETUP_COMMAND = "/etc/keystone/hybrid-backend-setup" | ||
| 33 | |||
