Skip to content

Commit

Permalink
pushed part 2
Browse files Browse the repository at this point in the history
  • Loading branch information
MrDoobPG authored and MrDoobPG committed Aug 30, 2019
1 parent 8008710 commit b18cdc9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
9 changes: 2 additions & 7 deletions menu/roles/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
state: started
enabled: yes
daemon_reload: yes
ansi

- name: Wait for 30 seconds before commencing
wait_for:
timeout: 30
Expand All @@ -166,9 +166,4 @@ ansi

- name: "Re-start all previously running Docker containers"
shell: 'docker start {{ docker_running_containers.stdout }} &> /dev/null || true'
when: (docker_binary.stat.exists) and (docker_service_running) and (docker_running_containers.stdout | trim | length > 0)

- name: "Install ctop"
import_role:
name: ctop
tags: ctop
when: (docker_binary.stat.exists) and (docker_service_running) and (docker_running_containers.stdout | trim | length > 0)
9 changes: 0 additions & 9 deletions menu/roles/kernel/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
# GNU General Public License v3.0 #
#########################################################################
---
- name: Set default 'reboot_is_necessary' variable
set_fact:
reboot_is_necessary: false

- name: Preinstall task
include_tasks: "subtasks/preinstall.yml"
when: ('preinstall' in ansible_run_tags)
Expand All @@ -32,10 +28,5 @@
- name: "Header Tasks"
include_tasks: "subtasks/headers.yml"

- name: "Restart Tasks"
include_tasks: "subtasks/restart.yml"
when: (reboot_is_necessary) and
(not continuous_integration)

- name: "Checks Tasks"
include_tasks: "subtasks/checks.yml"

0 comments on commit b18cdc9

Please sign in to comment.