diff --git a/elements/heat-cfntools/install.d/05-heat-cfntools b/elements/heat-cfntools/install.d/05-heat-cfntools index be4cb1411..47e2e6147 100755 --- a/elements/heat-cfntools/install.d/05-heat-cfntools +++ b/elements/heat-cfntools/install.d/05-heat-cfntools @@ -9,6 +9,9 @@ mkdir -p /opt/stack/venvs VENV=/opt/stack/venvs/heat-cfntools virtualenv $VENV +# bug #1293812 : Avoid easy_install triggering on pbr. +$VENV/bin/pip install -U 'pbr>=0.5.21,<1.0' + $VENV/bin/pip install 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 3551ba66f..e0fcd3759 100755 --- a/elements/openstack-clients/bin/install-openstack-client +++ b/elements/openstack-clients/bin/install-openstack-client @@ -20,6 +20,10 @@ set -u # downloading from pypi using http_proxy and https_proxy pip install -U 'setuptools>=1.0' +# bug #1293812 : Avoid easy_install triggering on pbr. +pip install -U 'pbr>=0.5.21,<1.0' + + pushd /opt/stack/$repo 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-config-applier b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier index b78f38f8c..da2c1225f 100755 --- a/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier +++ b/elements/os-apply-config/install.d/os-apply-config-source-install/10-os-config-applier @@ -8,6 +8,8 @@ virtualenv --setuptools /opt/stack/venvs/os-apply-config # https://pypi.python.org/simple/ if using http_proxy and https_proxy # envvars /opt/stack/venvs/os-apply-config/bin/pip install -U 'setuptools>=1.0' +# bug #1293812 : Avoid easy_install triggering on pbr. +/opt/stack/venvs/os-apply-config/bin/pip install -U 'pbr>=0.6,<1.0' /opt/stack/venvs/os-apply-config/bin/pip install -U os-apply-config ln -s /opt/stack/venvs/os-apply-config/bin/os-apply-config /usr/local/bin/os-apply-config 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 2362cc8e3..2de3f689d 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 @@ -8,6 +8,8 @@ virtualenv --setuptools /opt/stack/venvs/os-collect-config # Need setuptools>=1.0 to manage connections when # downloading from pypi using http_proxy and https_proxy /opt/stack/venvs/os-collect-config/bin/pip install -U 'setuptools>=1.0' +# bug #1293812 : Avoid easy_install triggering on pbr. +/opt/stack/venvs/os-collect-config/bin/pip install -U 'pbr>=0.6,<1.0' /opt/stack/venvs/os-collect-config/bin/pip install -U os-collect-config ln -s /opt/stack/venvs/os-collect-config/bin/os-collect-config /usr/local/bin/os-collect-config 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 e98ee2bfb..e81979260 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 @@ -12,6 +12,8 @@ virtualenv --setuptools /opt/stack/venvs/os-refresh-config # downloading from pypi using http_proxy and https_proxy /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 os-refresh-config ln -s /opt/stack/venvs/os-refresh-config/bin/os-refresh-config /usr/local/bin/os-refresh-config diff --git a/elements/os-svc-install/bin/os-svc-install b/elements/os-svc-install/bin/os-svc-install index a0226cb14..5dc7680ce 100755 --- a/elements/os-svc-install/bin/os-svc-install +++ b/elements/os-svc-install/bin/os-svc-install @@ -32,6 +32,9 @@ function python-install() { # https_proxy envvars pip install -U 'setuptools>=1.0' + # bug #1293812 : Avoid easy_install triggering on pbr. + pip install -U 'pbr>=0.5.21,<1.0' + if [ -n "$reqs" ] ; then pip install -r $reqs # FIXME: pip requires doesn't include MySQL-python 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 23e26ddb9..c863e0667 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 @@ -2,6 +2,9 @@ set -eux +# bug #1293812 : Avoid easy_install triggering on pbr. +$SWIFT_VENV_DIR/bin/pip install -U 'pbr>=0.5.21,<1.0' + # This is only needed if using keystone auth, so isn't in requirements.txt $SWIFT_VENV_DIR/bin/pip install python-keystoneclient diff --git a/elements/tempest/install.d/51-tempest b/elements/tempest/install.d/51-tempest index 94490b568..7036fb6c5 100755 --- a/elements/tempest/install.d/51-tempest +++ b/elements/tempest/install.d/51-tempest @@ -8,6 +8,9 @@ os-svc-install -u tempest -r /opt/stack/tempest source $TEMPEST_VENV_DIR/bin/activate cd /opt/stack/tempest +# bug #1293812 : Avoid easy_install triggering on pbr. +pip install -U 'pbr>=0.5.21,<1.0' + pip install -r test-requirements.txt testr init