From d3121477179fe12a1aa2b2d4ffde4b12e4924367 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Sat, 9 Jul 2016 15:37:35 +0100 Subject: [PATCH] Removed the default pip install options from upgrade.sh Instead of forcing to reinstall pip packages during an upgrade, we should instead make sure the environment always have the latest pip package version. This commit is part of a group of commits to ensure latest pip packages are installed in the venv (cf. topic pip-install-latest on gerrit) for the standard playbooks, and remove the options used by default in the upgrade script (pip_install_options=--force-reinstall) Closes-Bug: 1596620 Change-Id: I9ce478217d806fe04a2fc25be4cd42a875a6ffa2 Signed-off-by: Jean-Philippe Evrard --- scripts/run-upgrade.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index 496e5b4460..b6012c3a36 100755 --- a/scripts/run-upgrade.sh +++ b/scripts/run-upgrade.sh @@ -55,7 +55,7 @@ function run_lock { # "/tmp/fix_container_interfaces.yml || true" # into a command, otherwise we'll get an error that there's no playbook # named || - eval "openstack-ansible $2 -e 'pip_install_options=--force-reinstall'" + eval "openstack-ansible $2" playbook_status="$?" echo "ran $run_item" @@ -71,7 +71,7 @@ function run_lock { echo "execute the remaining tasks manually:" # run the tasks in order for item in ${!RUN_TASKS[@]}; do - echo "openstack-ansible ${RUN_TASKS[$item]} -e 'pip_install_options=--force-reinstall'" + echo "openstack-ansible ${RUN_TASKS[$item]}" done echo "******************** failure ********************" exit 99