From 85c68ffc75200d4d02df47d8407a5f2182fbc853 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 2 Jul 2015 16:50:06 +0100 Subject: [PATCH] Update pbr version to match global requirements The version of pbr we were using was having trouble parsing a new version identifier for python-qpid, We have the pbr version hardcoded in many places so update it to match whats currently in global-requirements. Fixes bug #1470871 Change-Id: Ia5aec472555ad1368684b224a55c29242ae40b58 --- elements/heat-cfntools/install.d/05-heat-cfntools | 2 +- elements/openstack-clients/bin/install-openstack-client | 2 +- .../install.d/os-apply-config-source-install/10-os-apply-config | 2 +- .../install.d/os-cloud-config-pip-install/90-os-cloud-config | 2 +- .../install.d/os-cloud-config-source-install/90-os-cloud-config | 2 +- .../os-collect-config-source-install/10-os-collect-config | 2 +- .../os-net-config-source-install/50-os-net-config-source | 2 +- .../os-refresh-config-source-install/10-os-refresh-config | 2 +- elements/os-svc-install/bin/os-svc-install | 2 +- .../swift-proxy/install.d/swift-source-install/76-swift-proxy | 2 +- elements/tempest/install.d/51-tempest | 2 +- requirements.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/elements/heat-cfntools/install.d/05-heat-cfntools b/elements/heat-cfntools/install.d/05-heat-cfntools index c281170ca..4a07de19d 100755 --- a/elements/heat-cfntools/install.d/05-heat-cfntools +++ b/elements/heat-cfntools/install.d/05-heat-cfntools @@ -21,7 +21,7 @@ $VENV/bin/pip install -U pip # downloading from pypi using http_proxy and https_proxy $VENV/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. -$VENV/bin/pip install -U 'pbr>=0.6,<1.0' +$VENV/bin/pip install -U 'pbr>=0.11,<2.0' $VENV/bin/pip install -U heat-cfntools # symlink to /opt/aws/bin diff --git a/elements/openstack-clients/bin/install-openstack-client b/elements/openstack-clients/bin/install-openstack-client index 72f6dfb05..c15c927d6 100755 --- a/elements/openstack-clients/bin/install-openstack-client +++ b/elements/openstack-clients/bin/install-openstack-client @@ -65,7 +65,7 @@ else pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. - pip install -U 'pbr>=0.5.21,<1.0' + pip install -U 'pbr>=0.11,<2.0' if [ -e requirements.txt ]; then pip install -r requirements.txt diff --git a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config index 6aeb265c2..cce3052ee 100755 --- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config +++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config @@ -17,7 +17,7 @@ else # envvars $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. - $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0' + $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0' $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U os-apply-config fi diff --git a/elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config b/elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config index fc69b4fdb..f9155c41a 100755 --- a/elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config +++ b/elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config @@ -18,7 +18,7 @@ else # envvars ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. - ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.6,<1.0' + ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.11,<2.0' ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install \ --install-option="--install-scripts=/usr/local/bin" -U os-cloud-config fi diff --git a/elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config b/elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config index f574710a0..eddeca708 100755 --- a/elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config +++ b/elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config @@ -17,7 +17,7 @@ else # envvars ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. - ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.6,<1.0' + ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.11,<2.0' if [ -e /opt/stack/os-cloud-config/requirements.txt ]; then reqs=/opt/stack/os-cloud-config/requirements.txt elif [ -e /opt/stack/os-cloud-config/tools/pip-requires ]; then diff --git a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config index bc19a8e69..4a0645d62 100755 --- a/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config +++ b/elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config @@ -15,7 +15,7 @@ else # downloading from pypi using http_proxy and https_proxy $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. - $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0' + $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0' $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U os-collect-config fi diff --git a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source index 4c2d10e5a..b071e639f 100755 --- a/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source +++ b/elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source @@ -17,7 +17,7 @@ else # envvars $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. - $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0' + $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0' $OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config fi diff --git a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config index 328e84706..fa19c9b58 100755 --- a/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config +++ b/elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config @@ -21,7 +21,7 @@ else /opt/stack/venvs/os-refresh-config/bin/pip install -U pip /opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. - /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.5.21,<1.0' + /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.11,<2.0' /opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config fi diff --git a/elements/os-svc-install/bin/os-svc-install b/elements/os-svc-install/bin/os-svc-install index 80e90cf33..51d7b9b29 100755 --- a/elements/os-svc-install/bin/os-svc-install +++ b/elements/os-svc-install/bin/os-svc-install @@ -38,7 +38,7 @@ function python_install() { pip install -U 'setuptools>=1.0' # bug #1293812 : Avoid easy_install triggering on pbr. - pip install -U 'pbr>=0.5.21,<1.0' + pip install -U 'pbr>=0.11,<2.0' if [ -n "$reqs" ] ; then # Install requirements off source repo if the install type diff --git a/elements/swift-proxy/install.d/swift-source-install/76-swift-proxy b/elements/swift-proxy/install.d/swift-source-install/76-swift-proxy index 14ad62344..29a93d58f 100755 --- a/elements/swift-proxy/install.d/swift-source-install/76-swift-proxy +++ b/elements/swift-proxy/install.d/swift-source-install/76-swift-proxy @@ -3,7 +3,7 @@ set -eux # bug #1293812 : Avoid easy_install triggering on pbr. -$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.5.21,<1.0' +$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0' # These are only needed if using keystone auth, so are not in requirements.txt $SWIFT_VENV_DIR/bin/pip install keystonemiddleware diff --git a/elements/tempest/install.d/51-tempest b/elements/tempest/install.d/51-tempest index 4762d6be2..521a1d015 100755 --- a/elements/tempest/install.d/51-tempest +++ b/elements/tempest/install.d/51-tempest @@ -11,7 +11,7 @@ set -u cd /opt/stack/tempest # bug #1293812 : Avoid easy_install triggering on pbr. -pip install -U 'pbr>=0.5.21,<1.0' +pip install -U 'pbr>=0.11,<2.0' pip install -r test-requirements.txt diff --git a/requirements.txt b/requirements.txt index 4e46b891f..322a9266b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pbr>=0.5.21,<1.0 +pbr>=0.11,<2.0