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

Change-Id: Ib1c83be6ed07c3c804704c2419e32c4d50fce04e
Implements: blueprint trusty-removal
---
 Vagrantfile           | 15 ---------------
 bindep.txt            |  2 +-
 meta/main.yml         |  1 -
 vars/ubuntu-14.04.yml | 31 -------------------------------
 4 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 vars/ubuntu-14.04.yml

diff --git a/Vagrantfile b/Vagrantfile
index e599fbb..e6e086b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,20 +1,5 @@
 Vagrant.configure(2) do |config|
 
-  config.vm.define "ubuntu1404" do |trusty|
-    trusty.vm.box = "ubuntu/trusty64"
-
-    trusty.vm.provider "virtualbox" do |v|
-      v.memory = 2048
-      v.cpus = 2
-    end
-
-    trusty.vm.provision "shell", inline: <<-SHELL
-      sudo su -
-      cd /vagrant
-      ./run_tests.sh
-    SHELL
-  end
-
   config.vm.define "ubuntu1604" do |xenial|
     xenial.vm.box = "ubuntu/xenial64"
     xenial.vm.provider "virtualbox" do |v|
diff --git a/bindep.txt b/bindep.txt
index 8a36bc8..8e6ca6e 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/meta/main.yml b/meta/main.yml
index c54d234..245e761 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/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml
deleted file mode 100644
index d8a0a9a..0000000
--- a/vars/ubuntu-14.04.yml
+++ /dev/null
@@ -1,31 +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.
-
-# Note this is a used in an iterable and requires the <item.value.interface> variable
-#   The container interface variable is a a default object that assume the
-#   Ansible iterator type is `with_dict`.
-lxc_container_interface: debian-interface.cfg.j2
-
-# Notice this is already resolved in the debian interface file
-lxc_container_route_interface: false
-lxc_container_default_route_interfaces: false
-
-# Note this is a used in an iterable and requires the <item.value.interface> variable
-lxc_container_interface_target: "/etc/network/interfaces.d/{{ item.value.interface }}.cfg"
-
-lxc_container_map:
-  distro: ubuntu
-  arch: "{{ lxc_architecture_mapping.get( hostvars[physical_host]['ansible_architecture'] | lower ) }}"
-  release: trusty