summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Higgins <derekh@redhat.com>2015-07-02 16:50:06 +0100
committerDerek Higgins <derekh@redhat.com>2015-07-02 16:53:06 +0100
commit85c68ffc75200d4d02df47d8407a5f2182fbc853 (patch)
treeb1714adb28b5f9432f93a2532c9aa32966eb2ddf
parent41f12da0946c2c5112126549ac05c1f28b025ae3 (diff)
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
Notes
Notes (review): Verified+2: Jenkins Code-Review+1: Steven Hardy <shardy@redhat.com> Code-Review+2: James Slagle <jslagle@redhat.com> Workflow+1: James Slagle <jslagle@redhat.com> Submitted-by: Jenkins Submitted-at: Thu, 02 Jul 2015 20:02:16 +0000 Reviewed-on: https://review.openstack.org/198039 Project: openstack/tripleo-image-elements Branch: refs/heads/master
-rwxr-xr-xelements/heat-cfntools/install.d/05-heat-cfntools2
-rwxr-xr-xelements/openstack-clients/bin/install-openstack-client2
-rwxr-xr-xelements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config2
-rwxr-xr-xelements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config2
-rwxr-xr-xelements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config2
-rwxr-xr-xelements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config2
-rwxr-xr-xelements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source2
-rwxr-xr-xelements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config2
-rwxr-xr-xelements/os-svc-install/bin/os-svc-install2
-rwxr-xr-xelements/swift-proxy/install.d/swift-source-install/76-swift-proxy2
-rwxr-xr-xelements/tempest/install.d/51-tempest2
-rw-r--r--requirements.txt2
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 c281170..4a07de1 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
21# downloading from pypi using http_proxy and https_proxy 21# downloading from pypi using http_proxy and https_proxy
22$VENV/bin/pip install -U 'setuptools>=1.0' 22$VENV/bin/pip install -U 'setuptools>=1.0'
23# bug #1293812 : Avoid easy_install triggering on pbr. 23# bug #1293812 : Avoid easy_install triggering on pbr.
24$VENV/bin/pip install -U 'pbr>=0.6,<1.0' 24$VENV/bin/pip install -U 'pbr>=0.11,<2.0'
25$VENV/bin/pip install -U heat-cfntools 25$VENV/bin/pip install -U heat-cfntools
26 26
27# symlink to /opt/aws/bin 27# symlink to /opt/aws/bin
diff --git a/elements/openstack-clients/bin/install-openstack-client b/elements/openstack-clients/bin/install-openstack-client
index 72f6dfb..c15c927 100755
--- a/elements/openstack-clients/bin/install-openstack-client
+++ b/elements/openstack-clients/bin/install-openstack-client
@@ -65,7 +65,7 @@ else
65 pip install -U 'setuptools>=1.0' 65 pip install -U 'setuptools>=1.0'
66 66
67 # bug #1293812 : Avoid easy_install triggering on pbr. 67 # bug #1293812 : Avoid easy_install triggering on pbr.
68 pip install -U 'pbr>=0.5.21,<1.0' 68 pip install -U 'pbr>=0.11,<2.0'
69 69
70 if [ -e requirements.txt ]; then 70 if [ -e requirements.txt ]; then
71 pip install -r requirements.txt 71 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 6aeb265..cce3052 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
17 # envvars 17 # envvars
18 $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0' 18 $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
19 # bug #1293812 : Avoid easy_install triggering on pbr. 19 # bug #1293812 : Avoid easy_install triggering on pbr.
20 $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0' 20 $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
21 $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U os-apply-config 21 $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U os-apply-config
22fi 22fi
23 23
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 fc69b4f..f9155c4 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
18 # envvars 18 # envvars
19 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0' 19 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0'
20 # bug #1293812 : Avoid easy_install triggering on pbr. 20 # bug #1293812 : Avoid easy_install triggering on pbr.
21 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.6,<1.0' 21 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.11,<2.0'
22 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install \ 22 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install \
23 --install-option="--install-scripts=/usr/local/bin" -U os-cloud-config 23 --install-option="--install-scripts=/usr/local/bin" -U os-cloud-config
24fi 24fi
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 f574710..eddeca7 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
17 # envvars 17 # envvars
18 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0' 18 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0'
19 # bug #1293812 : Avoid easy_install triggering on pbr. 19 # bug #1293812 : Avoid easy_install triggering on pbr.
20 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.6,<1.0' 20 ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'pbr>=0.11,<2.0'
21 if [ -e /opt/stack/os-cloud-config/requirements.txt ]; then 21 if [ -e /opt/stack/os-cloud-config/requirements.txt ]; then
22 reqs=/opt/stack/os-cloud-config/requirements.txt 22 reqs=/opt/stack/os-cloud-config/requirements.txt
23 elif [ -e /opt/stack/os-cloud-config/tools/pip-requires ]; then 23 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 bc19a8e..4a0645d 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
15 # downloading from pypi using http_proxy and https_proxy 15 # downloading from pypi using http_proxy and https_proxy
16 $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0' 16 $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
17 # bug #1293812 : Avoid easy_install triggering on pbr. 17 # bug #1293812 : Avoid easy_install triggering on pbr.
18 $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0' 18 $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
19 $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U os-collect-config 19 $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U os-collect-config
20fi 20fi
21 21
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 4c2d10e..b071e63 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
17 # envvars 17 # envvars
18 $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0' 18 $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
19 # bug #1293812 : Avoid easy_install triggering on pbr. 19 # bug #1293812 : Avoid easy_install triggering on pbr.
20 $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.6,<1.0' 20 $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
21 $OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config 21 $OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config
22fi 22fi
23 23
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 328e847..fa19c9b 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
21 /opt/stack/venvs/os-refresh-config/bin/pip install -U pip 21 /opt/stack/venvs/os-refresh-config/bin/pip install -U pip
22 /opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0' 22 /opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0'
23 # bug #1293812 : Avoid easy_install triggering on pbr. 23 # bug #1293812 : Avoid easy_install triggering on pbr.
24 /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.5.21,<1.0' 24 /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.11,<2.0'
25 /opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config 25 /opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config
26fi 26fi
27 27
diff --git a/elements/os-svc-install/bin/os-svc-install b/elements/os-svc-install/bin/os-svc-install
index 80e90cf..51d7b9b 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() {
38 pip install -U 'setuptools>=1.0' 38 pip install -U 'setuptools>=1.0'
39 39
40 # bug #1293812 : Avoid easy_install triggering on pbr. 40 # bug #1293812 : Avoid easy_install triggering on pbr.
41 pip install -U 'pbr>=0.5.21,<1.0' 41 pip install -U 'pbr>=0.11,<2.0'
42 42
43 if [ -n "$reqs" ] ; then 43 if [ -n "$reqs" ] ; then
44 # Install requirements off source repo if the install type 44 # 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 14ad623..29a93d5 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 @@
3set -eux 3set -eux
4 4
5# bug #1293812 : Avoid easy_install triggering on pbr. 5# bug #1293812 : Avoid easy_install triggering on pbr.
6$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.5.21,<1.0' 6$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
7 7
8# These are only needed if using keystone auth, so are not in requirements.txt 8# These are only needed if using keystone auth, so are not in requirements.txt
9$SWIFT_VENV_DIR/bin/pip install keystonemiddleware 9$SWIFT_VENV_DIR/bin/pip install keystonemiddleware
diff --git a/elements/tempest/install.d/51-tempest b/elements/tempest/install.d/51-tempest
index 4762d6b..521a1d0 100755
--- a/elements/tempest/install.d/51-tempest
+++ b/elements/tempest/install.d/51-tempest
@@ -11,7 +11,7 @@ set -u
11 11
12cd /opt/stack/tempest 12cd /opt/stack/tempest
13# bug #1293812 : Avoid easy_install triggering on pbr. 13# bug #1293812 : Avoid easy_install triggering on pbr.
14pip install -U 'pbr>=0.5.21,<1.0' 14pip install -U 'pbr>=0.11,<2.0'
15 15
16pip install -r test-requirements.txt 16pip install -r test-requirements.txt
17 17
diff --git a/requirements.txt b/requirements.txt
index 4e46b89..322a926 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
pbr>=0.5.21,<1.0 pbr>=0.11,<2.0