openstack/tripleo-image-elements
Code Issues Proposed changes

Remove pip install --pre

Browse Source 
We were installing some packages with support for prerelease versions in
expectation of needing it in our CI. This turns out to not be needed so
we should remove it.

Change-Id: I7ae440d3534e33144942c2230a88cf54f8a153d3
This commit is contained in:
Gregory Haynes 2014-10-23 08:01:17 -07:00
parent 355cce77f9
commit a5941bf329
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/heat-cfntools/install.d/05-heat-cfntools
View File

@ -24,7 +24,7 @@ $VENV/bin/pip install -U pip
$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 --pre -U heat-cfntools
$VENV/bin/pip install -U heat-cfntools
# symlink to /opt/aws/bin
$VENV/bin/cfn-create-aws-symlinks --source $VENV/bin

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

@ -18,7 +18,7 @@ else
/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 --pre -U os-apply-config
/opt/stack/venvs/os-apply-config/bin/pip install -U os-apply-config
fi
# Write the manifest of what was installed

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

@ -18,7 +18,7 @@ else
/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 --pre -U os-collect-config
/opt/stack/venvs/os-collect-config/bin/pip install -U os-collect-config
fi
# Write the manifest of what was installed

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

@ -18,7 +18,7 @@ else
$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 --pre -U os-net-config
$OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config
fi
# Write the manifest of what was installed

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

@ -22,7 +22,7 @@ else
/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 --pre -U os-refresh-config
/opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config
fi
# Write the manifest of what was installed