python-nova: use explicit file lists, versus variables

By setting the FILES_ packaging variables via .inc local vars,
we can run into trouble with variable resolution timing and hence
packaging fails.

We temporarily switch back to explicit (and duplicated) file lists
to fix packaging

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 26 insertions, 6 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
index 686c1d7..a4822f2 100644
--- a/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
@@ -12,6 +12,7 @@ SRC_URI += "file://nova-all \
 inherit controller update-rc.d
 
 PACKAGES = "${SRCNAME}-controller ${SRCNAME}-controller-misc"
+# PACKAGES = "${SRCNAME}-controller-misc ${SRCNAME}-controller"
 
 do_install_append() {
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
@@ -37,11 +38,20 @@ pkg_postinst_${SRCNAME}-controller () {
     nova-manage db sync
 }
 
-
-FILES_${SRCNAME}-controller = "${files_${SRCNAME}-controller}"
+# FILES_${SRCNAME}-controller = "${files_${SRCNAME}-controller}"
+FILES_${SRCNAME}-controller = "${bindir}/* \
+                               ${sysconfdir}/${SRCNAME}/* \
+                               ${sysconfdir}/init.d/nova-all"
 
 # If the compute is built, so we package it out of the way
-FILES_${SRCNAME}-controller-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-common} ${files_${PYTHON_PN}}"
+# FILES_${SRCNAME}-controller-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-common} ${files_${PYTHON_PN}}"
+FILES_${SRCNAME}-controller-misc = "${libdir}/*\
+                                    ${bindir}/nova-compute \
+                                    ${sysconfdir}/${SRCNAME}/* \
+                                    ${sysconfdir}/init.d/nova-compute \
+                                    ${bindir}/nova-manage \
+                                    ${bindir}/nova-rootwrap \
+                                    ${sysconfdir}/sudoers.d"
 
 RDEPENDS_${SRCNAME}-controller = "${PYTHON_PN} ${SRCNAME}-common \
                                   postgresql postgresql-client python-psycopg2"
diff --git a/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb
index c10bebb..c48f8d1 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_2013.1.3.bb
@@ -12,11 +12,21 @@ pkg_postinst_${SRCNAME}-common () {
 
 PACKAGES += "${SRCNAME}-common ${SRCNAME}-common-misc"
 
-FILES_${PN} = "${files_${PN}}"
+# FILES_${PN} = "${files_${PN}}"
+FILES_${PN} = "${libdir}/*"
 
-FILES_${SRCNAME}-common = "${files_${SRCNAME}-common}"
+# FILES_${SRCNAME}-common = "${files_${SRCNAME}-common}"
+FILES_${SRCNAME}-common = "${bindir}/nova-manage \
+                           ${bindir}/nova-rootwrap \
+                           ${sysconfdir}/sudoers.d"
 
-FILES_${SRCNAME}-common-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-controller}"
+# FILES_${SRCNAME}-common-misc = "${files_${SRCNAME}-compute} ${files_${SRCNAME}-controller}"
+FILES_${SRCNAME}-common-misc = "${bindir}/nova-compute \
+                                ${sysconfdir}/${SRCNAME}/* \
+                                ${sysconfdir}/init.d/nova-compute \
+                                ${bindir}/* \
+                                ${sysconfdir}/${SRCNAME}/* \
+                                ${sysconfdir}/init.d/nova-all"
 
 RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \
         iptables curl dnsmasq sudo procps"