From b5f2e870d72464ca722c7734681875bf392f3366 Mon Sep 17 00:00:00 2001 From: Paul Durivage Date: Tue, 19 Sep 2017 12:47:52 -0400 Subject: [PATCH] remove Ubuntu 12.04 support. Fixes #186 --- Vagrantfile | 7 ------- meta/main.yml | 5 ++--- tasks/main.yml | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index b313ba8..6f65e36 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,13 +6,6 @@ role = File.basename(File.expand_path(File.dirname(__FILE__))) ENV['ANSIBLE_ROLES_PATH'] = "../" boxes = [ - { - :name => "ubuntu-1204", - :box => "ubuntu/precise64", - :ip => '10.0.77.11', - :cpu => "33", - :ram => "256" - }, { :name => "ubuntu-1404", :box => "ubuntu/trusty64", diff --git a/meta/main.yml b/meta/main.yml index 845ace8..eed3ebe 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,7 @@ --- galaxy_info: author: Paul Durivage - description: A comprehensive and (ideally) sane way to install Docker on Ubuntu 12.04+ + description: A comprehensive and (ideally) sane way to install Docker on Ubuntu 14.04+ license: Apache v2.0 min_ansible_version: 2.2 platforms: @@ -10,9 +10,9 @@ galaxy_info: - jessie - name: Ubuntu versions: - - precise - trusty - xenial + - zesty categories: - development - packaging @@ -22,4 +22,3 @@ dependencies: [] # dependencies available via galaxy should be listed here. # Be sure to remove the '[]' above if you add dependencies # to this list. - diff --git a/tasks/main.yml b/tasks/main.yml index b55c460..96341aa 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -3,10 +3,10 @@ - name: "Include proper python vars file" include_vars: "{{ python_vars_file }}" -- name: Fail if not a new release of Ubuntu +- name: Fail if not a supported release of Ubuntu fail: msg: "{{ ansible_distribution_version }} is not an acceptable version of Ubuntu for this role" - when: ansible_lsb.id|lower == "ubuntu" and ( ansible_distribution_version|version_compare('12.04', '<') or ansible_distribution_version|version_compare('12.10', '=') ) + when: ansible_lsb.id|lower == "ubuntu" and ansible_distribution_version|version_compare('14.04', '<') - name: Fail if not a new release of Debian fail: