summaryrefslogtreecommitdiffstats
path: root/ansible/roles
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/roles')
-rw-r--r--ansible/roles/docker/handlers/main.yml3
-rw-r--r--ansible/roles/docker/tasks/main.yml3
2 files changed, 5 insertions, 1 deletions
diff --git a/ansible/roles/docker/handlers/main.yml b/ansible/roles/docker/handlers/main.yml
index de4a52ac..9916a81b 100644
--- a/ansible/roles/docker/handlers/main.yml
+++ b/ansible/roles/docker/handlers/main.yml
@@ -1,3 +1,6 @@
---
- name: Restart Docker
import_tasks: docker_restart.yml
+ when:
+ - ansible_env.container is defined
+ - ansible_env.container != 'docker'
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 1925d09b..cd731b11 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -8,9 +8,10 @@
- name: Install docker python module
package:
- name: 'python2-docker'
+ name: 'python-docker-py'
state: present
+
- name: Install python jsonpointer module
package:
name: 'python-jsonpointer'