Skip to content

Commit

Permalink
fixed legacy as the packages are no longer available (#25)
Browse files Browse the repository at this point in the history
* removed legacy

* removed legacy as packages are no longer avail
  • Loading branch information
ericsysmin authored and Gaurav Rastogi committed Feb 25, 2019
1 parent 5f039cc commit eeb65a6
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 202 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ For more information about the variables many can be found https://docs.docker.c

| Variable | Required | Default | Comments |
|----------|----------|---------|----------|
| `docker_edition` | No | `ce` | Specifies either legacy, ce, or ee version of Docker. |
| `docker_edition` | No | `ce` | Specifies either ce, or ee version of Docker. |
| `docker_ee_url` | No | `Undefined` | Docker EE URL from the Docker Store |
| `docker_repo` | No | `docker` | Defines how Ansible manages the repository. Options are "other" and "docker" |
| `docker_channel` | No | `stable` | What release channel of Docker to install. |
Expand Down
20 changes: 0 additions & 20 deletions tasks/ce/os/oraclelinux.yml

This file was deleted.

78 changes: 0 additions & 78 deletions tasks/legacy/apt.yml

This file was deleted.

24 changes: 0 additions & 24 deletions tasks/legacy/dnf.yml

This file was deleted.

48 changes: 0 additions & 48 deletions tasks/legacy/yum.yml

This file was deleted.

16 changes: 9 additions & 7 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
"This role works best with ansible version 2.4 or greater.
It is recommended to use the latest ansible version for the best experience."
- name: Docker | Manage OS not supported by docker-ce
fail:
msg: "This OS is not supported by Docker-CE, and therefor not supported by this role."
when:
- docker_edition == "ce"
- (ansible_distribution|lower == "centos" and ansible_distribution_major_version == "6") or
ansible_distribution|lower == "redhat" or
ansible_distribution|lower == "oraclelinux"

- name: Docker | Include {{ ansible_distribution }} specific variables
include_vars: "ansible_distribution/{{ ansible_distribution.split(' ', 1)[0]|lower }}.yml"

Expand All @@ -25,13 +34,6 @@
include_tasks: "storage_drivers/{{ docker_storage_driver }}.yml"
when: docker_storage_driver is defined

- name: Docker | Manage OS not supported by docker-ce
set_fact:
docker_edition: legacy
when: (ansible_distribution|lower == "centos" and ansible_distribution_major_version == "6") or
(ansible_distribution|lower == "redhat" and ansible_distribution_major_version == "6") or
(ansible_distribution|lower == "oraclelinux" and ansible_distribution_major_version == "6")

- name: Docker | Start Installation
include_tasks: "{{ docker_edition }}/{{ ansible_pkg_mgr }}.yml"
when: docker_repo == "docker"
Expand Down
12 changes: 0 additions & 12 deletions tasks/other_repo.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
---
- name: Docker Legacy | Start Installation | Other repo
package:
name: docker-engine
when:
- docker_repo == "other"
- docker_edition == "legacy"
register: task_result
until: task_result is success
retries: 10
delay: 2

- name: Docker | Start Installation | Other repo
package:
name: "docker-{{ docker_edition }}"
when:
- docker_repo == "other"
- docker_edition != "legacy"
register: task_result
until: task_result is success
retries: 10
Expand Down
3 changes: 0 additions & 3 deletions vars/ansible_distribution/centos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ docker_ce_repo_url: https://download.docker.com/linux/centos
docker_ce_repo_file_url: "{{ docker_ce_repo_url }}/docker-ce.repo"
docker_ce_gpg_key: "{{ docker_ce_repo_url }}/gpg"
docker_ce_edge_repo_url: "{{ docker_ce_repo_url }}/{{ ansible_distribution_major_version }}/$basearch/edge"

docker_legacy_repo_url: https://yum.dockerproject.org/repo/main/centos/{{ ansible_distribution_major_version }}
docker_legacy_gpg_key: https://yum.dockerproject.org/gpg
3 changes: 0 additions & 3 deletions vars/ansible_distribution/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ docker_ce_repo_url: https://download.docker.com/linux/fedora
docker_ce_repo_file_url: "{{ docker_ce_repo_url }}/docker-ce.repo"
docker_ce_gpg_key: "{{ docker_ce_repo_url }}/gpg"
docker_ce_edge_repo_url: "{{ docker_ce_repo_url }}/{{ ansible_distribution_major_version }}/$basearch/edge"

docker_legacy_repo_url: https://yum.dockerproject.org/repo/main/fedora/{{ ansible_distribution_major_version }}
docker_legacy_gpg_key: https://yum.dockerproject.org/gpg
3 changes: 0 additions & 3 deletions vars/ansible_distribution/opensuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ docker_ce_repo_url: https://download.docker.com/linux/opensuse
docker_ce_repo_file_url: "{{ docker_ce_repo_url }}/docker-ce.repo"
docker_ce_gpg_key: "{{ docker_ce_repo_url }}/gpg"
docker_ce_edge_repo_url: "{{ docker_ce_repo_url }}/{{ ansible_distribution_major_version }}/$basearch/edge"

docker_legacy_repo_url: https://yum.dockerproject.org/repo/main/opensuse/{{ ansible_distribution_major_version }}
docker_legacy_gpg_key: https://yum.dockerproject.org/gpg
3 changes: 0 additions & 3 deletions vars/ansible_distribution/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ docker_ce_repo_url: https://download.docker.com/linux/centos
docker_ce_repo_file_url: "{{ docker_ce_repo_url }}/docker-ce.repo"
docker_ce_gpg_key: "{{ docker_ce_repo_url }}/gpg"
docker_ce_edge_repo_url: "{{ docker_ce_repo_url }}/{{ ansible_distribution_major_version }}/$basearch/edge"

docker_legacy_repo_url: https://yum.dockerproject.org/repo/main/centos/{{ ansible_distribution_major_version }}
docker_legacy_gpg_key: https://yum.dockerproject.org/gpg

0 comments on commit eeb65a6

Please sign in to comment.