diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2014-08-12 12:23:25 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-08-27 10:39:57 -0400 |
commit | ef73f2d62a52088e956ca4e916bbc50b928db7cf (patch) | |
tree | dd5e08e32ad1e8c6b2689d15d187239fc0cd6a77 | |
parent | 036805a066a7398b3b5142f7a157189f03dfddcf (diff) | |
download | meta-cloud-services-ef73f2d62a52088e956ca4e916bbc50b928db7cf.tar.gz |
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 <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
3 files changed, 3 insertions, 0 deletions
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 () { | |||
38 | 'internalurl':"'http://${KEYSTONE_HOST}:9313/v1'"} | 38 | 'internalurl':"'http://${KEYSTONE_HOST}:9313/v1'"} |
39 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) | 39 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) |
40 | } | 40 | } |
41 | SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" | ||
41 | 42 | ||
42 | do_install_append() { | 43 | do_install_append() { |
43 | TEMPLATE_CONF_DIR=${S}${sysconfdir}/${SRCNAME} | 44 | 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 () { | |||
46 | 46 | ||
47 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) | 47 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) |
48 | } | 48 | } |
49 | SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" | ||
49 | 50 | ||
50 | do_install_prepend() { | 51 | do_install_prepend() { |
51 | sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/conf_fixture.py | 52 | 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 () { | |||
39 | 39 | ||
40 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) | 40 | d.setVarFlags("SERVICECREATE_PARAM_%s-setup" % d.getVar('SRCNAME',True), flags) |
41 | } | 41 | } |
42 | SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST" | ||
42 | 43 | ||
43 | do_install_prepend() { | 44 | do_install_prepend() { |
44 | sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py | 45 | sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py |