Automate the removal of the molteniron role

In an upgrade from Queens to Rocky, the molteniron role is still
there, causing the repo build process to pick it up and try to
build wheels - but it fails.

Here we ensure that the upgrade process cleans it up, preventing
this from happening.

Closes-Bug: 1794599
Change-Id: I641fc0deb8292af0cb19887837d4de8d618cd18f
This commit is contained in:
Jesse Pretorius 2018-09-26 21:20:43 +01:00
parent aa100d4ecd
commit e94c56ebe5
4 changed files with 55 additions and 0 deletions

View File

@ -141,6 +141,19 @@ galaxy-named roles.
# openstack-ansible "${UPGRADE_PLAYBOOKS}/ceph-galaxy-removal.yml"
Clean up the molteniron role
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The molteniron service is not an official OpenStack project, and has been
removed from the integrated build. It can still be optionally added, but
due to the fact that it was previously integrated we need to remove it
during this major upgrade to ensure that the repo build process does not
try to build its wheels.
.. code-block:: console
# openstack-ansible "${UPGRADE_PLAYBOOKS}/molteniron-role-removal.yml"
Upgrade hosts
~~~~~~~~~~~~~

View File

@ -59,6 +59,18 @@ The roles will be cloned according to the new naming, and an upgrade
playbook ``ceph-galaxy-removal.yml`` has been added to clean up the stale
galaxy-named roles.
.. _molteniron-role-removal:
Clean up the molteniron role
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The molteniron service is not an official OpenStack project, and has been
removed from the integrated build. It can still be optionally added, but
due to the fact that it was previously integrated we need to remove it
during this major upgrade to ensure that the repo build process does not
try to build its wheels. The upgrade playbook ``molteniron-role-removal.yml``
has been added to clean it up.
.. _setup-infra-playbook:
setup-infrastructure.yml

View File

@ -172,6 +172,7 @@ function main {
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/user-secrets-adjustment.yml")
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/pip-conf-removal.yml")
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/ceph-galaxy-removal.yml")
RUN_TASKS+=("${UPGRADE_PLAYBOOKS}/molteniron-role-removal.yml")
# we don't want to trigger container restarts for these groups yet
RUN_TASKS+=("setup-hosts.yml --limit '!galera_all:!neutron_agent:!rabbitmq_all'")
# add new container config to containers but don't restart

View File

@ -0,0 +1,29 @@
---
# Copyright 2017, Logan Vig <logan2211@gmail.com>
#
# 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 the molteniron role
hosts: localhost
gather_facts: true
user: root
tasks:
# The molteniron service is not an official OpenStack project, and
# has been removed from the integrated build. It can still be optionally
# added, but due to the fact that it was previously integrated we need
# to remove it during this major upgrade to ensure that the repo build
# process does not try to build its wheels.
- name: Remove molteniron role if found
file:
path: "/etc/ansible/roles/os_molteniron"
state: "absent"