Remove Trusty support from memcached_server role

Change-Id: Idf6c9f8ce01f467f30ceef72f6b22dd029b6e942
Implements: blueprint trusty-removal
This commit is contained in:
Andy McCrae 2016-12-15 11:22:14 +00:00
parent a15eb19c23
commit bb49d55afb
5 changed files with 2 additions and 17 deletions

2
Vagrantfile vendored
View File

@ -1,5 +1,5 @@
Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/trusty64"
config.vm.box = "ubuntu/xenial64"
config.vm.provision "shell", inline: <<-SHELL
sudo su -
cd /vagrant

View File

@ -32,7 +32,7 @@ libselinux-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,4 +22,3 @@
service:
name: "memcached"
state: "restarted"
pattern: "memcached"

View File

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

View File

@ -50,19 +50,6 @@
when:
- ansible_service_mgr == 'systemd'
- name: Apply resource limits (upstart)
template:
src: "memcached.debian.j2"
dest: "/etc/default/memcached"
owner: "root"
group: "root"
mode: "0644"
when:
- ansible_pkg_mgr == 'apt'
- ansible_service_mgr != 'systemd'
- memcached_connections > 1024
notify: Restart memcached
- name: Apply resource limits (systemd)
template:
src: "limits.conf.j2"