Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions infrastructure/server-setup/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,6 @@
- docker
tags:
- docker

- include_tasks:
file: tasks/override-docker-startup.yml
apply:
tags:
- docker
tags:
- docker

- include_tasks:
file: tasks/deployment-user.yml
Expand Down Expand Up @@ -170,6 +162,13 @@
become: yes
become_method: sudo
tasks:
- include_tasks:
file: tasks/override-docker-startup.yml
apply:
tags:
- docker
tags:
- docker
- include_tasks:
file: tasks/elasticsearch.yml
apply:
Expand All @@ -186,4 +185,18 @@
tags:
- traefik

# Ensure incorrectly created override of docker daemon (1.9 beta) is removed on workers
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this one off?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, state: absent ensures the file is not in place anymore

- hosts: docker-workers
become: yes
become_method: sudo
tasks:
- name: Remove docker service override directory
file:
path: /etc/systemd/system/docker.service.d
state: absent

- name: Reload systemd daemon to apply changes
systemd:
daemon_reload: yes

- import_playbook: backups.yml
Loading