openstack/openstack-ansible
Code Issues Proposed changes

Re-add the upgrade playbook removing pip.conf

Browse Source 
Change-Id: Ie858314f30c07ddcf55fe9a7623c99baf3b037c5
Closes-Bug: 1826427
This commit is contained in:
Jimmy McCrory 2019-05-03 13:38:56 -06:00
parent 8492e93c1f
commit ebf844c4e9
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/source/admin/upgrades/major-upgrades.rst
View File

@ -151,6 +151,17 @@ Please review the contents of the playbook for more information.
# openstack-ansible "${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml" # openstack-ansible "${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml"
Clean up the pip.conf file
~~~~~~~~~~~~~~~~~~~~~~~~~~
The presence of the ``pip.conf`` file can cause build failures during the
upgrade to |current_release_formal_name|. This playbook removes the
``pip.conf`` file on all servers and containers.
.. code-block:: console
# openstack-ansible ""${SCRIPTS_PATH}/upgrade-utilities/pip-conf-removal.yml"
Upgrade hosts Upgrade hosts
~~~~~~~~~~~~~ ~~~~~~~~~~~~~

1
scripts/run-upgrade.sh
View File

@ -180,6 +180,7 @@ function main {
pushd ${MAIN_PATH}/playbooks pushd ${MAIN_PATH}/playbooks
RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml") RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml")
RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/pip-conf-removal.yml")
# we don't want to trigger container restarts for these groups yet # we don't want to trigger container restarts for these groups yet
RUN_TASKS+=("setup-hosts.yml --limit '!galera_all:!rabbitmq_all'") RUN_TASKS+=("setup-hosts.yml --limit '!galera_all:!rabbitmq_all'")
# add new container config to containers but don't restart # add new container config to containers but don't restart

23
scripts/upgrade-utilities/pip-conf-removal.yml Normal file
View File

@ -0,0 +1,23 @@
# 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"