From 88bb4d33d99de6810f07f3c60052d1fe49cfa10f Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 9 Dec 2019 13:49:00 +0200 Subject: [PATCH] Drop pip-conf-removal task This task was essential for migration from R->S as we were migrtating from usage of wheels stored on repo server to usage of python_venv_build role. This task is not relevant now and can be dropped. Moreover it makes upgrade script re-run fail during S->T upgrade when upgrade playbook failed first time before finishing setup_hosts playbook (creating all required containers). Change-Id: Ice98040e529f21c7369df45b020b284c959d9c8c --- scripts/run-upgrade.sh | 1 - .../upgrade-utilities/pip-conf-removal.yml | 23 ------------------- 2 files changed, 24 deletions(-) delete mode 100644 scripts/upgrade-utilities/pip-conf-removal.yml diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index 8eed6633df..0ffcfa7952 100755 --- a/scripts/run-upgrade.sh +++ b/scripts/run-upgrade.sh @@ -168,7 +168,6 @@ function main { bootstrap_ansible pushd ${MAIN_PATH}/playbooks - RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/pip-conf-removal.yml") RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml") # we don't want to trigger container restarts for galera and rabbit # but as there will be no hosts available for metal deployments, diff --git a/scripts/upgrade-utilities/pip-conf-removal.yml b/scripts/upgrade-utilities/pip-conf-removal.yml deleted file mode 100644 index cd200f2cb9..0000000000 --- a/scripts/upgrade-utilities/pip-conf-removal.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2015, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Remove pip.conf if found - hosts: all - gather_facts: true - user: root - tasks: - - name: Remove pip.conf - file: - path: "{{ ansible_env.HOME }}/.pip/pip.conf" - state: "absent"