From bb49d55afb0066bf1c4280e66ff56211a065277d Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Thu, 15 Dec 2016 11:22:14 +0000
Subject: [PATCH] Remove Trusty support from memcached_server role

Change-Id: Idf6c9f8ce01f467f30ceef72f6b22dd029b6e942
Implements: blueprint trusty-removal
---
 Vagrantfile                |  2 +-
 bindep.txt                 |  2 +-
 handlers/main.yml          |  1 -
 meta/main.yml              |  1 -
 tasks/memcached_config.yml | 13 -------------
 5 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 44872e1..40fe913 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -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
diff --git a/bindep.txt b/bindep.txt
index fe58925..ee6c1ca 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -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]
diff --git a/handlers/main.yml b/handlers/main.yml
index 0279006..7f06f5c 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -22,4 +22,3 @@
   service:
     name: "memcached"
     state: "restarted"
-    pattern: "memcached"
diff --git a/meta/main.yml b/meta/main.yml
index 1bead14..67f6133 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -22,7 +22,6 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - trusty
         - xenial
     - name: EL
       versions:
diff --git a/tasks/memcached_config.yml b/tasks/memcached_config.yml
index cebad26..29fab6d 100644
--- a/tasks/memcached_config.yml
+++ b/tasks/memcached_config.yml
@@ -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"