Minor fixes to help integration of CORD-912
Change-Id: I8dd69bf2eae091ca60bbbfbfebce465405662a58
diff --git a/roles/docker-install/handlers/main.yml b/roles/docker-install/handlers/main.yml
deleted file mode 100644
index 697fec7..0000000
--- a/roles/docker-install/handlers/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# docker-install/handlers/main.yml
-
-- name: docker-restart
- become: yes
- service:
- name: docker
- state: restarted
-
diff --git a/roles/docker-install/tasks/main.yml b/roles/docker-install/tasks/main.yml
index 826d5bb..2beb5c7 100644
--- a/roles/docker-install/tasks/main.yml
+++ b/roles/docker-install/tasks/main.yml
@@ -5,9 +5,9 @@
- name: Prereqs and SSL support for apt for SSL
become: yes
apt:
- name={{ item }}
- update_cache=yes
- cache_valid_time=3600
+ name: "{{ item }}"
+ update_cache: yes
+ cache_valid_time: 3600
with_items:
- apt-transport-https
- ca-certificates
@@ -26,9 +26,9 @@
- name: Install docker
become: yes
apt:
- update_cache=yes
- cache_valid_time=3600
- name=docker-engine
+ name: docker-engine
+ update_cache: yes
+ cache_valid_time: 3600
# docker fails without docker-py, docker-compose >1.9 fails with docker-py installed
- name: Install docker-compose and docker-py