noheat: Upgrades, refactor, deploy Devstack

[integration.git] / deployment / noheat / cluster-rke / ansible / roles / setup_docker / tasks / main.yml

diff --git a/deployment/noheat/cluster-rke/ansible/roles/setup_docker/tasks/main.yml b/deployment/noheat/cluster-rke/ansible/roles/setup_docker/tasks/main.yml
index 29dee31..12e13f4 100644 (file)
--- a/deployment/noheat/cluster-rke/ansible/roles/setup_docker/tasks/main.yml
+++ b/deployment/noheat/cluster-rke/ansible/roles/setup_docker/tasks/main.yml
@@ -1,38 +1,6 @@
-- name: Install deps
-  apt:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - apt-transport-https
-    - ca-certificates
-    - curl
-    - software-properties-common
-
-- name: Add Docker repo key
-  apt_key:
-    url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg"
-    state: present
-
-- name: Add Docker repo
-  apt_repository:
-    repo: "deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release | lower }} stable"
-    state: present
-    update_cache: yes
-
-- name: Find exact Docker version
-  shell: "apt-cache madison docker-ce | grep {{ docker_version }} | head -n 1 | cut -d ' ' -f 4"
-  register: docker_pkg_version
-
-- name: install Docker
-  apt:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - "docker-ce={{ docker_pkg_version.stdout }}"
-    - "docker-ce-cli={{ docker_pkg_version.stdout }}"
-
-- name: Lock docker version
-  command: apt-mark hold docker-ce docker-ce-cli
+---
+- name: Setup Docker repo and packages
+  include_tasks: packages.yml
 
 - name: Add user to docker group
   user:
@@ -46,3 +14,13 @@
     name: docker
     state: started
     enabled: yes
+
+- name: Configure Docker
+  copy:
+    dest: /etc/docker/daemon.json
+    content: "{{ docker_config | to_nice_json }}"
+    mode: 0600
+    backup: true
+  when: docker_config is defined
+  notify:
+    - restart docker