Remove unused/unnecessary haproxy_server vars/files

openstack/openstack-ansible-haproxy_server

Code Issues Proposed changes

The repo/keys are left over from Newton/Trusty and
were not removed when Trusty support was removed.
The required packages were only necessary in order
to facilitate the repo addition.
The var haproxy_distro_packages is defined in all
distro-specific vars files, so its presence in
defaults is unnecessary.
The apt pinning meta dependency is no longer
required - it's another leftover from Ubuntu Trusty.
A task is included to remove the old config files.
Change-Id: I912cd170d05c4a9befe3420971ddf68ff2ddde2b

This commit is contained in:

Jesse Pretorius

2017年08月21日 12:24:47 +01:00

parent 957a8697b0

commit 2470c01693

5 changed files with 32 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6
defaults/main.yml

View File

@@ -26,12 +26,6 @@ haproxy_rise: 3

haproxy_fall:3

haproxy_interval:12000

## Haproxy standard API

haproxy_repo:{}

haproxy_gpg_keys:[]

haproxy_required_distro_packages:[]

haproxy_distro_packages:[]

## Haproxy Stats

haproxy_stats_enabled:False

haproxy_stats_bind_address:127.0.0.1

9
meta/main.yml

View File

@@ -36,11 +36,4 @@ galaxy_info:

- python

- development

- openstack

dependencies:

- role:apt_package_pinning

apt_pinned_packages:[{package:"*", release: LP-PPA-vbernat-haproxy-1.5, priority:"1001"}]

apt_package_pinning_file_name:"haproxy_pin.pref"

when:

- ansible_pkg_mgr == 'apt'

- haproxy_ssl | bool

- ansible_distribution_version | version_compare('16.04', '<')

dependencies:[]

8
releasenotes/notes/remove-haproxy-repo-vars-051a47bbfaf6d1da.yaml Normal file

View File

@@ -0,0 +1,8 @@

---

upgrade:

- |

The following variables have been removed from the ``haproxy_server`` role

as they are no longer necessary or used.

- haproxy_repo

- haproxy_gpg_keys

- haproxy_required_distro_packages

9
tasks/haproxy_pre_install.yml

View File

@@ -87,3 +87,12 @@

path:"/etc/haproxy/conf.d"

state:directory

mode:"0755"

- name:Remove old config files

file:

path:"{{ item }}"

state:absent

with_items:

- "{{ haproxy_remove_files }}"

when:

- ansible_pkg_mgr == 'apt'

19
vars/ubuntu-16.04.yml

View File

@@ -16,14 +16,23 @@

## APT Cache options

cache_timeout:600

haproxy_required_distro_packages:

- python-software-properties

- software-properties-common

- debconf-utils

haproxy_distro_packages:

- haproxy

- netcat# Used for the Ansible haproxy module

- psmisc

- rsyslog # Used for local logging

- vim-haproxy

# This file list is to handle upgrades

# from previous versions where an apt

# pinning config file or repo config

# file was put in place to use a PPA

# for Newton/Trusty. Unfortunately

# some file config info was left in

# place long after Trusty support was

# removed, so the removal of these

# files is still necessary.

haproxy_remove_files:

- "/etc/apt/preferences.d/haproxy_pin.pref"

- "/etc/apt/sources.list.d/haproxy.list"

- "/etc/apt/sources.list.d/ppa_launchpad_net_vbernat_haproxy_1_5_ubuntu.list"