summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2014-08-12 12:23:25 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-08-27 10:40:02 -0400
commitc2e835140fe2a2898fb7124c9038f632a3b8d464 (patch)
tree3a1c6d4669ced3a0905e9440fc9130cbf04b470d
parent8a7209f3e5eeb664ca92a4a122c8aa70b90c548f (diff)
downloadmeta-cloud-services-c2e835140fe2a2898fb7124c9038f632a3b8d464.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>
-rw-r--r--meta-openstack/recipes-devtools/python/python-barbican_git.bb1
-rw-r--r--meta-openstack/recipes-devtools/python/python-cinder_git.bb1
-rw-r--r--meta-openstack/recipes-devtools/python/python-glance_git.bb1
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}
41SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
41 42
42do_install_append() { 43do_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 9914aa2..d22e1ac 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}
49SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
49 50
50do_install_prepend() { 51do_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 afd280a..5d5ec53 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_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}
49SERVICECREATE_PACKAGES[vardeps] += "KEYSTONE_HOST"
49 50
50do_install_prepend() { 51do_install_prepend() {
51 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py 52 sed 's:%PYTHON_SITEPACKAGES_DIR%:${PYTHON_SITEPACKAGES_DIR}:g' -i ${S}/${SRCNAME}/tests/functional/__init__.py