Remove Trusty support for haproxy_server role

Change-Id: Ia299c8e4b534c611458b7e136367d4ed68637433
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 11:08:29 +00:00
parent 76640281b6
commit 6380766d0a
7 changed files with 1 additions and 143 deletions

8
Vagrantfile vendored
View File

@ -3,14 +3,6 @@ Vagrant.configure(2) do |config|
v.memory = 2048
v.cpus = 2
end
config.vm.define "ubuntu1404" do |trusty|
trusty.vm.box = "ubuntu/trusty64"
trusty.vm.provision "shell", inline: <<-SHELL
sudo su -
cd /vagrant
apt-get update
./run_tests.sh
SHELL
end
config.vm.define "ubuntu1604" do |xenial|

View File

@ -33,7 +33,7 @@ libsemanage-python [platform:rpm]
# For SSL SNI support
python-pyasn1 [platform:dpkg]
python-openssl [platform:dpkg]
python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-trusty]
python-ndg-httpsclient [platform:ubuntu]
python2-pyasn1 [platform:rpm]
pyOpenSSL [platform:rpm]
python-ndg_httpsclient [platform:rpm]

View File

@ -22,12 +22,10 @@
service:
name: "haproxy"
state: "restarted"
pattern: "haproxy"
enabled: "yes"
- name: Restart rsyslog
service:
name: "rsyslog"
state: "restarted"
pattern: "rsyslog"
enabled: "yes"

View File

@ -22,7 +22,6 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- trusty
- xenial
- name: EL
versions:

View File

@ -1,76 +0,0 @@
---
# Copyright 2014, 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.
# NOTE(cloudnull) This file can be removed when we drop 14.04 support
- name: Install haproxy pre packages
apt:
pkg: "{{ item }}"
state: "{{ haproxy_package_state }}"
update_cache: yes
cache_valid_time: "{{ cache_timeout }}"
register: install_packages
until: install_packages|success
retries: 5
delay: 2
with_items: "{{ haproxy_required_distro_packages }}"
tags:
- haproxy-pre-apt-packages
- name: Add haproxy apt-keys
apt_key:
id: "{{ item.hash_id }}"
keyserver: "{{ item.keyserver | default(omit) }}"
data: "{{ item.data | default(omit) }}"
url: "{{ item.url | default(omit) }}"
state: "present"
register: add_keys
until: add_keys|success
failed_when: false
retries: 5
delay: 2
with_items: "{{ haproxy_gpg_keys }}"
tags:
- haproxy-apt-keys
- name: Add haproxy apt-keys using fallback keyserver
apt_key:
id: "{{ item.hash_id }}"
keyserver: "{{ item.fallback_keyserver | default(omit) }}"
url: "{{ item.fallback_url | default(omit) }}"
state: "present"
register: add_keys_fallback
until: add_keys_fallback|success
retries: 5
delay: 2
with_items: "{{ haproxy_gpg_keys }}"
when: add_keys|failed and (item.fallback_keyserver is defined or item.fallback_url is defined)
tags:
- haproxy-apt-keys
- name: Add haproxy repo(s)
apt_repository:
repo: "{{ haproxy_repo.repo }}"
state: "{{ haproxy_repo.state }}"
update_cache: yes
when:
- haproxy_repo.repo is defined
- haproxy_repo.state is defined
register: add_repos
until: add_repos|success
retries: 5
delay: 2
tags:
- haproxy-repos

View File

@ -13,11 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# NOTE(cloudnull) This can be removed when we drop 14.04 support
- include: haproxy_add_ppa_repo.yml
when:
- ansible_distribution_version | version_compare('16.04', '<')
- name: Install HAProxy Packages
apt:
pkg: "{{ item }}"
@ -31,13 +26,3 @@
with_items: "{{ haproxy_distro_packages }}"
tags:
- haproxy-apt-packages
# NOTE(cloudnull) This can be removed when we drop 14.04 support
- name: Replace haproxy DEFAULT file
copy:
src: haproxy.default
dest: /etc/default/haproxy
when:
- ansible_distribution_version | version_compare('16.04', '<')
tags:
- haproxy-config

View File

@ -1,40 +0,0 @@
---
# Copyright 2016, 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.
## APT Cache options
cache_timeout: 600
haproxy_apt_repo_url: "http://ppa.launchpad.net/vbernat/haproxy-1.5/ubuntu"
haproxy_repo:
repo: "deb {{ haproxy_apt_repo_url }} {{ ansible_distribution_release }} main"
state: "present"
# Haproxy GPG Keys
haproxy_gpg_keys:
- key_name: 'haproxy'
keyserver: 'hkp://keyserver.ubuntu.com:80'
fallback_keyserver: 'hkp://p80.pool.sks-keyservers.net:80'
hash_id: '0xcffb779aadc995e4f350a060505d97a41c61b9cd'
haproxy_required_distro_packages:
- python-software-properties
- software-properties-common
- debconf-utils
haproxy_distro_packages:
- haproxy
- rsyslog # Used for local logging
- vim-haproxy
- psmisc