From ef73f2d62a52088e956ca4e916bbc50b928db7cf Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 12 Aug 2014 12:23:25 -0400 Subject: Keystone: package service/user addition sstate vardeps Several packages utilize the keystone package service/user addition services recently added. The data passed to this service depends on the value assigned to CONTROLLER_IP (used as KEYSTONE_HOST), however, bitbake is not able to automatically determine this dependency so several tasks which should be rerun to create updated package postinst scripts are not run when CONTROLLER_IP is modified. Adding the necessary vardeps ensure these tasks are rerun and now adjustments made to CONTROLLER_IP are reflected in the generated packages. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-barbican_git.bb | 1 + meta-openstack/recipes-devtools/python/python-cinder_git.bb | 1 + meta-openstack/recipes-devtools/python/python-glance_git.bb | 1 + 3 files changed, 3 insertions(+) diff --git a/meta-openstack/recipes-devtools/python/python-barbican_git.bb b/meta-openstack/recipes-devtools/python/python-barbican_git.bb index 86b86e6..3eb69dd 100644 --- a/meta-openstack/recipes-devtools/python/python-barbican_git.bb +++ b/meta-openstack/recipes-devtools/python/python-barbican_git.bb @@ -38,6 +38,7 @@ python () { 'internalurl':"'http://${KEYSTONE_HOST}:9313/v1'"} d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) } +SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" do_install_append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 3124600..22e2059 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -46,6 +46,7 @@ python () { d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) } +SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" do_install_prepend() { sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/conf_fixture.py diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index a59512f..c8b7d3f 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -39,6 +39,7 @@ python () { d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) } +SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" do_install_prepend() { sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py -- cgit v1.2.3-54-g00ecf