From 0aec82d70fa032bfe616ea5058d504f860e241f8 Mon Sep 17 00:00:00 2001 From: Andy Ning Date: Wed, 16 Jul 2014 11:37:37 -0400 Subject: Keystone: package service/user additions Instead of creating tenant/user/role and service/endpoint for all openstack services in keystone postinstall, now each of the services creates its own keystone identities by queueing them up in its postinstall to a file /etc/keystone/service-user-setup. service-user-setup script, when run as the last postinstall, calls identity.sh with keystone identity parameters to create necessary identities for the services. Signed-off-by: Andy Ning --- .../recipes-devtools/python/python-swift_git.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'meta-openstack/recipes-devtools/python/python-swift_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb index 7bab0bd..16f99f7 100644 --- a/meta-openstack/recipes-devtools/python/python-swift_git.bb +++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb @@ -29,6 +29,25 @@ inherit setuptools python-dir update-rc.d hosts identity # filesystem of must support xattrs. e.g ext4 SWIFT_BACKING_FILE_SIZE ?= "2G" +SERVICECREATE_PACKAGES = "${SRCNAME}-setup" +KEYSTONE_HOST="${CONTROLLER_IP}" + +# USERCREATE_PARAM and SERVICECREATE_PARAM contain the list of parameters to be set. +# If the flag for a parameter in the list is not set here, the default value will be given to that parameter. +# Parameters not in the list will be set to empty. + +USERCREATE_PARAM_${SRCNAME}-setup = "name pass tenant role email" +SERVICECREATE_PARAM_${SRCNAME}-setup = "name type description region publicurl adminurl internalurl" +python () { + flags = {'type':'object-store',\ + 'description':'OpenStack object-store',\ + 'publicurl':"'http://${KEYSTONE_HOST}:8888/v1/AUTH_\$(tenant_id)s'",\ + 'adminurl':"'http://${KEYSTONE_HOST}:8888/v1'",\ + 'internalurl':"'http://${KEYSTONE_HOST}:8888/v1/AUTH_\$(tenant_id)s'"} + + d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) +} + do_install_append() { SWIFT_CONF_DIR=${D}${sysconfdir}/swift -- cgit v1.2.3-54-g00ecf