Remove package cache proxy cleanup

This should have been removed in Train so it's really time to
get rid of these tasks now. The package cache was retired in Rocky.

Change-Id: I98d527b8e804685b8d933de2dc5e2efeb78bbd31
This commit is contained in:
Jonathan Rosser 2020-07-21 08:48:50 +01:00
parent 8fa414e1f8
commit 1b18926bbf
9 changed files with 0 additions and 102 deletions

View File

@ -1,75 +0,0 @@
---
# Copyright 2016, 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.
# TODO(odyssey4me):
# Remove these tasks in T. They are only present for the
# Q->R upgrade or for R->S upgrades for environments which
# were installed prior to R's release.
- name: Remove apt package manager proxy
file:
dest: "/etc/apt/apt.conf.d/00apt-cacher-proxy"
state: "absent"
register: _apt_proxy_removed
when:
- ansible_os_family == 'Debian'
tags:
- common-proxy
- name: Update apt when proxy is added/removed
apt:
update_cache: yes
retries: 5
delay: 2
when:
- _apt_proxy_removed is mapping
- _apt_proxy_removed is changed
tags:
- common-proxy
# NOTE(mhayden): We always deploy the proxy configuration for yum on CentOS
# even if dnf is present.
- name: Remove yum package manager proxy
lineinfile:
line: >-
proxy=http://{{ internal_lb_vip_address }}:{{ repo_pkg_cache_port | default('3142') }}
dest: "/etc/yum.conf"
state: absent
when:
- ansible_os_family == 'RedHat'
tags:
- common-proxy
- name: Remove yum package manager proxy in repo definitions
shell: |
sed -i -e '/proxy = http:\/\/{{ internal_lb_vip_address }}:{{ repo_pkg_cache_port | default('3142') }}/d' /etc/yum.repos.d/*
when:
- ansible_os_family == 'RedHat'
tags:
- common-proxy
# NOTE(mhayden): If dnf and yum are installed on CentOS, we need to configure
# a proxy for dnf as well.
- name: Remove dnf package manager proxy
lineinfile:
line: >-
proxy="http://{{ internal_lb_vip_address }}:{{ repo_pkg_cache_port | default('3142') }}"
dest: "/etc/dnf/dnf.conf"
state: absent
when:
- ansible_os_family == 'RedHat'
- ansible_pkg_mgr == 'dnf'
tags:
- common-proxy

View File

@ -76,9 +76,6 @@
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- lxc-containers-create
pre_tasks:
- include_tasks: common-tasks/package-cache-proxy.yml
when: install_method == "source"
roles:
- role: "openstack_hosts"
is_container: true

View File

@ -114,8 +114,6 @@
setup:
gather_subset: "network,hardware,virtual"
- include_tasks: common-tasks/package-cache-proxy.yml
when: install_method == "source"
roles:
- role: "openstack_hosts"
is_container: true

View File

@ -62,8 +62,6 @@
(ansible_os_family == 'Suse' and ansible_distribution_major_version in ['15', '42'])
msg: "The only supported platforms for this release are Debian Stretch or Buster, Ubuntu 18.04 LTS (Bionic), CentOS 7 (WIP) and openSUSE Leap 42.X and openSUSE Leap 15.X"
- include_tasks: common-tasks/package-cache-proxy.yml
when: install_method == "source"
roles:
- role: "openstack_hosts"
vars_files:

View File

@ -37,10 +37,6 @@
when:
- hostvars['localhost']['resolvconf_enabled'] | bool
- name: Configure package proxy cache
include_tasks: common-tasks/package-cache-proxy.yml
when: install_method == "source"
roles:
- role: "os_blazar"
- role: "system_crontab_coordination"

View File

@ -38,10 +38,6 @@
when:
- hostvars['localhost']['resolvconf_enabled'] | bool
- name: Configure package proxy cache
include_tasks: common-tasks/package-cache-proxy.yml
when: install_method == "source"
roles:
- role: "os_congress"
- role: "system_crontab_coordination"

View File

@ -37,10 +37,6 @@
when:
- hostvars['localhost']['resolvconf_enabled'] | bool
- name: Configure package proxy cache
include_tasks: common-tasks/package-cache-proxy.yml
when: install_method == "source"
roles:
- role: "os_mistral"
- role: "system_crontab_coordination"

View File

@ -36,10 +36,6 @@
when:
- hostvars['localhost']['resolvconf_enabled'] | bool
- name: Configure package proxy cache
include_tasks: common-tasks/package-cache-proxy.yml
when: install_method == "source"
roles:
- role: "os_murano"
- role: "system_crontab_coordination"

View File

@ -37,10 +37,6 @@
when:
- hostvars['localhost']['resolvconf_enabled'] | bool
- name: Configure package proxy cache
include_tasks: common-tasks/package-cache-proxy.yml
when: install_method == "source"
roles:
- role: "os_placement"
- role: "system_crontab_coordination"