Browse Source

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
Derek Higgins 3 years ago
parent
commit
85c68ffc75

+ 1
- 1
elements/heat-cfntools/install.d/05-heat-cfntools View File

@@ -21,7 +21,7 @@ $VENV/bin/pip install -U pip
21 21
 # downloading from pypi using http_proxy and https_proxy
22 22
 $VENV/bin/pip install -U 'setuptools>=1.0'
23 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 25
 $VENV/bin/pip install -U heat-cfntools
26 26
 
27 27
 # symlink to /opt/aws/bin

+ 1
- 1
elements/openstack-clients/bin/install-openstack-client View File

@@ -65,7 +65,7 @@ else
65 65
     pip install -U 'setuptools>=1.0'
66 66
 
67 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 70
     if [ -e requirements.txt ]; then
71 71
         pip install -r requirements.txt

+ 1
- 1
elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config View File

@@ -17,7 +17,7 @@ else
17 17
     # envvars
18 18
     $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
19 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 21
     $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U os-apply-config
22 22
 fi
23 23
 

+ 1
- 1
elements/os-cloud-config/install.d/os-cloud-config-pip-install/90-os-cloud-config View File

@@ -18,7 +18,7 @@ else
18 18
     # envvars
19 19
     ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0'
20 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 22
     ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install \
23 23
         --install-option="--install-scripts=/usr/local/bin" -U os-cloud-config
24 24
 fi

+ 1
- 1
elements/os-cloud-config/install.d/os-cloud-config-source-install/90-os-cloud-config View File

@@ -17,7 +17,7 @@ else
17 17
     # envvars
18 18
     ${OS_CLOUD_CONFIG_VENV_DIR}/bin/pip install -U 'setuptools>=1.0'
19 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 21
     if [ -e /opt/stack/os-cloud-config/requirements.txt ]; then
22 22
         reqs=/opt/stack/os-cloud-config/requirements.txt
23 23
     elif [ -e /opt/stack/os-cloud-config/tools/pip-requires ]; then

+ 1
- 1
elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config View File

@@ -15,7 +15,7 @@ else
15 15
     # downloading from pypi using http_proxy and https_proxy
16 16
     $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
17 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 19
     $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U os-collect-config
20 20
 fi
21 21
 

+ 1
- 1
elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source View File

@@ -17,7 +17,7 @@ else
17 17
     # envvars
18 18
     $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
19 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 21
     $OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config
22 22
 fi
23 23
 

+ 1
- 1
elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config View File

@@ -21,7 +21,7 @@ else
21 21
     /opt/stack/venvs/os-refresh-config/bin/pip install -U pip
22 22
     /opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0'
23 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 25
     /opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config
26 26
 fi
27 27
 

+ 1
- 1
elements/os-svc-install/bin/os-svc-install View File

@@ -38,7 +38,7 @@ function python_install() {
38 38
         pip install -U 'setuptools>=1.0'
39 39
 
40 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 43
         if [ -n "$reqs" ] ; then
44 44
             # Install requirements off source repo if the install type

+ 1
- 1
elements/swift-proxy/install.d/swift-source-install/76-swift-proxy View File

@@ -3,7 +3,7 @@
3 3
 set -eux
4 4
 
5 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 8
 # These are only needed if using keystone auth, so are not in requirements.txt
9 9
 $SWIFT_VENV_DIR/bin/pip install keystonemiddleware

+ 1
- 1
elements/tempest/install.d/51-tempest View File

@@ -11,7 +11,7 @@ set -u
11 11
 
12 12
 cd /opt/stack/tempest
13 13
 # bug #1293812 : Avoid easy_install triggering on pbr.
14
-pip install -U 'pbr>=0.5.21,<1.0'
14
+pip install -U 'pbr>=0.11,<2.0'
15 15
 
16 16
 pip install -r test-requirements.txt
17 17
 

+ 1
- 1
requirements.txt View File

@@ -1 +1 @@
1
-pbr>=0.5.21,<1.0
1
+pbr>=0.11,<2.0

Loading…
Cancel
Save