make docker role more generic

4 files changed, 34 insertions, 39 deletions

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
new file mode 100644
index 00000000..50075b1a
--- /dev/null
+++ b/roles/docker/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+docker_pkg_provider: distro
+docker_pkg_name: docker.io
+
+# docker_pkg_provider: docker-com
+# docker_pkg_name: docker-ce
+
+# docker_pkg_version:
diff --git a/roles/docker/tasks/docker-com.yml b/roles/docker/tasks/docker-com.yml
new file mode 100644
index 00000000..9a5dfce0
--- /dev/null
+++ b/roles/docker/tasks/docker-com.yml
@@ -0,0 +1,16 @@
+---
+- name: install apt https transport
+  apt:
+    name: apt-transport-https
+    state: present
+
+- name: add docker apt key
+  apt_key:
+    data: "{{ lookup('file', 'docker-apt-key.asc') }}"
+    state: present
+
+- name: add docker apt repo
+  apt_repository:
+    repo: "deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable"
+    state: present
+    filename: docker
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 2253f1ed..017e2786 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -21,30 +21,18 @@
       fstype: "{{ docker_lvm.fs }}"
       state: mounted
 
-- name: install apt https transport
-  apt:
-    name: apt-transport-https
-    state: present
-
-- name: add docker apt key
-  apt_key:
-    data: "{{ lookup('file', 'docker-apt-key.asc') }}"
-    state: present
-
-- name: add docker apt repo
-  apt_repository:
-    repo: "deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable"
-    state: present
-    filename: docker
+- name: prepare package provider
+  when: docker_pkg_provider != 'distro'
+  include_tasks: "{{ docker_pkg_provider }}.yml"
 
 - name: install docker
   apt:
-    name: "docker-ce{% if docker_pkg_version is defined %}={{ docker_pkg_version }}{% endif %}"
+    name: "{{ docker_pkg_name }}{% if docker_pkg_version is defined %}={{ docker_pkg_version }}{% endif %}"
     state: present
     force: yes
 
 - name: disable automatic upgrades for docker package
   when: docker_pkg_version is defined
   dpkg_selections:
-    name: docker-ce
+    name: "{{ docker_pkg_name }}"
     selection: hold
diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml
index 8b07be78..0e631379 100644
--- a/roles/elevate/media/tasks/main.yml
+++ b/roles/elevate/media/tasks/main.yml
@@ -1,24 +1,7 @@
 ---
-- name: create logical volume for docker
-  lvol:
-    vg: "{{ host_name }}"
-    lv: docker
-    size: 20g
-
-- name: create filesystem for docker
-  filesystem:
-    fstype: ext4
-    dev: "/dev/mapper/{{ host_name | replace('-', '--') }}-docker"
-
-- name: mount filesytem for docker
-  mount:
-    src: "/dev/mapper/{{ host_name | replace('-', '--') }}-docker"
-    path: /var/lib/docker
-    fstype: ext4
-    state: mounted
-
-- name: install needed packages
+- name: install packages
   apt:
-    name:
-      - docker.io
-      - mdadm
+    name: nginx
+    state: present
+
+## TODO: finish installation...