Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
Drop support for Ubuntu 12.04
  • Loading branch information
tersmitten committed Nov 28, 2018
1 parent 15d471c commit 64cab97
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 59 deletions.
1 change: 0 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- precise
- trusty
- xenial
- bionic
Expand Down
35 changes: 0 additions & 35 deletions tasks/backported-kernel.yml

This file was deleted.

22 changes: 4 additions & 18 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
# tasks file for docker
---
- name: apt update
apt:
update_cache: true
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
tags:
- configuration
- docker
- docker-apt
- docker-apt-update

# TODO: Cleanup
- include: backported-kernel.yml
when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('12.04', '==')
tags:
- configuration
- docker
- docker-backported-kernel

- name: install | dependencies | pre
apt:
name: "{{ docker_dependencies_pre }}"
state: "{{ apt_install_state | default('latest') }}"
tags:
- configuration
- docker
- docker-install
- docker-install-dependencies
- docker-install-dependencies-pre

- include: repository.yml
tags:
Expand All @@ -42,6 +26,7 @@
- configuration
- docker
- docker-install
- docker-install-dependencies

- name: configuration | update - /etc/default/docker
template:
Expand All @@ -55,6 +40,7 @@
- configuration
- docker
- docker-configuration
- docker-configuration-update

- name: start and enable service
service:
Expand Down
5 changes: 0 additions & 5 deletions vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# vars file for docker
---
# For Ubuntu 12.04
docker_backported_kernel_packages:
- linux-image-generic-lts-trusty
- linux-headers-generic-lts-trusty

docker_dependencies_pre_dummy_package: apt
docker_dependencies_pre:
- apt-transport-https
Expand Down

0 comments on commit 64cab97

Please sign in to comment.