python-*: prevent setuptools from fetching required eggs

Several python packages require 'python-pbr' both at build and
runtime, as listed in their respective setup.py files, yet this
dependency is not included in their recipe. Adding python-pbr
to the RDEPENDS to correct this.

In addition this situation is complicated by the fact that the
setuptools will actually fetch python-pip and python-pbr eggs,
regardless of the value of BB_NO_NETWORK, if any of these packages are
built before python-pip and python-pbr are in the sysroot. Most
dramitically if you were to attempt to build any of these packages
with no network connectivity the do_compile() task will fail with the
following:

| DEBUG: Executing shell function do_compile
| Download error: [Errno 110] Connection timed out -- Some packages may not be found!
| Couldn't find index page for 'pip' (maybe misspelled?)
| Download error: [Errno 110] Connection timed out -- Some packages may not be found!
| No local packages or download links found for pip>=1.0
| Traceback (most recent call last):
|   File "setup.py", line 21, in <module>
|     pbr=True)

Adding the missing DEPENDS will ensure these packages are available
without the need for setuptools to fetch them, and avoid possible
build issues due to network connectivity.

In order to test these modifications all of these packages have been
built with a populated sstate cache and the network crippled using:

iptables -A OUTPUT -p tcp --destination-port 80 -j DROP

to ensure no extra fetches are taking place.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

22 files changed, 141 insertions, 2 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
index cf0d196..e67f2bf 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer_git.bb
@@ -131,6 +131,11 @@ FILES_${SRCNAME}-controller = "${bindir}/* \
                                ${sysconfdir}/init.d/ceilometer-agent-central \
 "
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += " \
         python-ply \
         python-jsonpath-rw \
@@ -175,6 +180,7 @@ RDEPENDS_${PN} += " \
         python-pyyaml \
         python-pip \
         python-pytz \
+        python-pbr \
         "
 
 RDEPENDS_${SRCNAME}-controller = "${PN} ${SRCNAME}-common ${SRCNAME}-alarm-notifier ${SRCNAME}-alarm-evaluator \
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
index 08b6286..811bbd5 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-ceilometerclient_git.bb
@@ -4,12 +4,18 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} +="python-cliff \
         python-httplib2 \
         python-iso8601 \
         python-prettytable \
         python-pyparsing \
         python-simplejson \
+        python-pbr \
         "
 
 PR = "r0"
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
index e770e98..a706223 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb
@@ -95,6 +95,11 @@ FILES_${SRCNAME} = "${bindir}/* \
     ${localstatedir}/* \
     "
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += "lvm2 \
     python-sqlalchemy \
         python-amqplib \
@@ -119,6 +124,7 @@ RDEPENDS_${PN} += "lvm2 \
         python-keystoneclient \
         python-swiftclient \
         python-oslo.config \
+        python-pbr \
         "
 
 RDEPENDS_${SRCNAME} = "${PN} \
diff --git a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
index a5c1c20..f12975e 100644
--- a/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-cinderclient_git.bb
@@ -16,8 +16,14 @@ S = "${WORKDIR}/git"
 
 inherit setuptools
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += "python-prettytable \
                    python-simplejson \
                    python-requests \
                    python-setuptools-git \
+                   python-pbr \
                    "
diff --git a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.1.4.bb b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.1.4.bb
index d38b83a..cad82cb 100644
--- a/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.1.4.bb
+++ b/meta-openstack/recipes-devtools/python/python-django-openstack-auth_1.1.4.bb
@@ -17,6 +17,12 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools 
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += "python-django  \
         python-keystoneclient  \
+        python-pbr \
         "
\ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb
index ca09907..1bd24d0 100644
--- a/meta-openstack/recipes-devtools/python/python-glance_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb
@@ -101,6 +101,11 @@ FILES_${SRCNAME}-registry = "${bindir}/glance-registry \
     ${sysconfdir}/init.d/glance-registry \
     "
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += "python-greenlet \
         python-sqlalchemy \
         python-anyjson \
@@ -121,6 +126,7 @@ RDEPENDS_${PN} += "python-greenlet \
         python-jsonschema \
         python-keystoneclient \
         python-swiftclient \
+        python-pbr \
         "
 
 RDEPENDS_${SRCNAME} = "${PN} \
diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
index 889b411..1d7a4d1 100644
--- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb
@@ -3,7 +3,11 @@ HOMEPAGE = "https://github.com/openstack/python-glanceclient"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
-DEPENDS = "gmp"
+DEPENDS += " \
+        gmp \
+        python-pip \
+        python-pbr \
+        "
 
 SRCREV = "23ad1d6db7ec8116afed7c8aca3832dac440930a"
 PV = "0.12.0+gitr${SRCREV}"
@@ -22,5 +26,6 @@ RDEPENDS_${PN} = "gmp \
    python-pyopenssl \
    python-prettytable \
    python-setuptools-git \
+   python-pbr \
    "
 
diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb
index 7fa798c..4c12551 100644
--- a/meta-openstack/recipes-devtools/python/python-heat_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb
@@ -105,6 +105,12 @@ FILES_${SRCNAME}-engine = "${bindir}/heat-engine \
                            ${bindir}/* \
                            ${sysconfdir}/init.d/heat-engine \
 "
+
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += " \
         python-heatclient \
         python-sqlalchemy \
@@ -148,6 +154,7 @@ RDEPENDS_${PN} += " \
         python-pyyaml \
         python-pip \
         python-pytz \
+        python-pbr \
         "
 
 RDEPENDS_${SRCNAME}-engine = "${PN} ${SRCNAME}-common postgresql postgresql-client python-psycopg2 tgt"
diff --git a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
index 2f3262c..fc9f020 100644
--- a/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-heatclient_git.bb
@@ -4,12 +4,18 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} +="python-cliff \
         python-httplib2 \
         python-iso8601 \
         python-prettytable \
         python-pyparsing \
         python-simplejson \
+        python-pbr \
         "
 
 PR = "r0"
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
index 3b2dd26..be45a2b 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb
@@ -4,6 +4,11 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 DEPENDS_${PN} += "python-django \
     python-django-compressor \
     python-django-openstack-auth \
@@ -19,6 +24,7 @@ DEPENDS_${PN} += "python-django \
     python-six \
     python-swiftclient \
     python-lockfile \
+    python-pbr \
     "
 
 PR = "r1"
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index aa42824..bb44fe4 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -109,6 +109,11 @@ FILES_${SRCNAME} = "${bindir}/* \
     ${localstatedir}/* \
     "
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += " \
         python-pam \
         python-webob \
@@ -126,6 +131,7 @@ RDEPENDS_${PN} += " \
         python-oslo.config \
         python-dogpile.core \
         python-dogpile.cache \
+        python-pbr \
         "
 
 # TODO:
diff --git a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
index 9a615bc..be2395a 100644
--- a/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystoneclient_git.bb
@@ -16,9 +16,15 @@ inherit setuptools
 
 FILES_${PN}-doc += "${datadir}/keystoneclient" 
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += "python-iso8601 \
         python-prettytable \
         python-requests \
         python-simplejson \
         python-oslo.config \
+        python-pbr \
         "
diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
index 6ad2289..4aa974e 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb
@@ -159,6 +159,11 @@ FILES_${SRCNAME}-extra-agents = "${bindir}/*"
 
 FILES_${SRCNAME}-doc = "${datadir}/*"
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += "python-paste \
         python-pastedeploy \
         python-routes \
@@ -181,6 +186,7 @@ RDEPENDS_${PN} += "python-paste \
         python-mako \
         python-markupsafe \
         python-pyparsing \
+        python-pbr \
         "
 
 RDEPENDS_${SRCNAME} = "${PN} \
diff --git a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
index 7dbf2a6..6d295c2 100644
--- a/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-neutronclient_git.bb
@@ -4,12 +4,18 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} +="python-cliff \
         python-httplib2 \
         python-iso8601 \
         python-prettytable \
         python-pyparsing \
         python-simplejson \
+        python-pbr \
         "
 
 PR = "r0"
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 4770448..e41e796 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -195,6 +195,11 @@ FILES_${SRCNAME}-api = " \
         ${sysconfdir}/init.d/nova-api \
 "
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} = " libvirt \
                    python-modules \
                    python-misc \
@@ -233,6 +238,7 @@ RDEPENDS_${PN} = " libvirt \
                    python-routes \
                    python-webob \
                    python-websockify \
+                   python-pbr \
     "
 
 RDEPENDS_${SRCNAME}-common = "${PN} openssl openssl-misc libxml2 libxslt \
diff --git a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
index efd514f..2884e0f 100644
--- a/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-novaclient_git.bb
@@ -15,8 +15,14 @@ S = "${WORKDIR}/git"
 
 inherit setuptools 
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += "python-iso8601 \
         python-prettytable \
         python-requests \
         python-simplejson \
+        python-pbr \
         "
diff --git a/meta-openstack/recipes-devtools/python/python-oslo.config_1.2.1.bb b/meta-openstack/recipes-devtools/python/python-oslo.config_1.2.1.bb
index 3ffdbe8..548c6cb 100644
--- a/meta-openstack/recipes-devtools/python/python-oslo.config_1.2.1.bb
+++ b/meta-openstack/recipes-devtools/python/python-oslo.config_1.2.1.bb
@@ -16,4 +16,9 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
+DEPENDS += " \
+        python-pbr \
+        python-pip \
+        "
+
 RDEPENDS_${PN} += "python-pbr"
\ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.8.2.bb b/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.8.2.bb
index 06cb619..7af55a7 100644
--- a/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.8.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-sqlalchemy-migrate_0.8.2.bb
@@ -16,7 +16,13 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += "python-sqlalchemy  \
         python-decorator \
         python-tempita  \
+        python-pbr \
     "
diff --git a/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb b/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb
index 061f6d4..2013fd0 100644
--- a/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb
+++ b/meta-openstack/recipes-devtools/python/python-stevedore_0.12.bb
@@ -15,3 +15,12 @@ SRC_URI[sha256sum] = "9689a76c09eaeb60b6db5b45aae71de8c53f15d302d790536ac5bf7c47
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
+RDEPENDS_${PN} += " \
+        python-pbr \
+        "
diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb
index 7248eda..3a31b82 100644
--- a/meta-openstack/recipes-devtools/python/python-swift_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb
@@ -37,6 +37,11 @@ FILES_${SRCNAME} = "${bindir}/* \
     ${sysconfdir}/${SRCNAME}/* \
 "
 
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
 RDEPENDS_${PN} += " \
     python-eventlet \
     python-greenlet \
@@ -45,6 +50,7 @@ RDEPENDS_${PN} += " \
     python-swiftclient \
     python-netifaces \
     python-xattr \
+    python-pbr \
     "
 
 RDEPENDS_${SRCNAME} = "${PN}"
\ No newline at end of file
diff --git a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb
index a856bbb..fe3f062 100644
--- a/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-swiftclient_git.bb
@@ -14,4 +14,12 @@ S = "${WORKDIR}/git"
 
 inherit setuptools 
 
-RDEPENDS_${PN} += "python-simplejson"
\ No newline at end of file
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
+RDEPENDS_${PN} += " \
+        python-simplejson \
+        python-pbr \
+        "
diff --git a/meta-openstack/recipes-devtools/python/python-wsme_0.5b6.bb b/meta-openstack/recipes-devtools/python/python-wsme_0.5b6.bb
index 86efde6..ccf2189 100644
--- a/meta-openstack/recipes-devtools/python/python-wsme_0.5b6.bb
+++ b/meta-openstack/recipes-devtools/python/python-wsme_0.5b6.bb
@@ -15,3 +15,12 @@ SRC_URI[sha256sum] = "9476b6c80fa9c36e966d80352e589d5fd9cf356b9bdec7f755b07ca5d2
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit setuptools
+
+DEPENDS += " \
+        python-pip \
+        python-pbr \
+        "
+
+RDEPENDS_${PN} += "\
+        python-pbr \
+        "