summaryrefslogtreecommitdiff
path: root/elements/os-cloud-config
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-02 20:02:16 +0000
committerGerrit Code Review <review@openstack.org>2015-07-02 20:02:16 +0000
commit5e4ec884233b77c04e0394557135781dbcef0f1d (patch)
tree522b3f916a5d1029aafe73f1701f56d7f1fa36b4 /elements/os-cloud-config
parentc87eb59e19cc08de6f6a9dd889da086672703d59 (diff)
parent85c68ffc75200d4d02df47d8407a5f2182fbc853 (diff)
Merge "Update pbr version to match global requirements"
Diffstat (limited to 'elements/os-cloud-config')
-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
2 files changed, 2 insertions, 2 deletions
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