diff --git a/inventories b/inventories index 4d4a59a1..59ac2276 160000 --- a/inventories +++ b/inventories @@ -1 +1 @@ -Subproject commit 4d4a59a12f39843ac7970b478959d3f4f9aa2869 +Subproject commit 59ac227683ec0018700df9568122226e6e3e164d diff --git a/roles/clean/tasks/docker-compose.yml b/roles/clean/tasks/docker-compose.yml index 8e38b082..861b61ed 100644 --- a/roles/clean/tasks/docker-compose.yml +++ b/roles/clean/tasks/docker-compose.yml @@ -2,4 +2,5 @@ command: "docker-compose -p {{ docker_compose_project_name }} down -v" args: chdir: "{{ docker_compose_data_dir }}" - register: result \ No newline at end of file + register: result + changed_when: true \ No newline at end of file diff --git a/roles/docker-compose/handlers/main.yml b/roles/docker-compose/handlers/main.yml index f728fe59..611df0b3 100644 --- a/roles/docker-compose/handlers/main.yml +++ b/roles/docker-compose/handlers/main.yml @@ -1,4 +1,5 @@ - name: "Restart {{ role_name }} project" - docker_compose: - project_src: "{{ docker_compose_data_dir }}" - state: restarted \ No newline at end of file + command: "docker-compose -p {{ docker_compose_project_name }} restart" + args: + chdir: "{{ docker_compose_data_dir }}" + changed_when: true \ No newline at end of file diff --git a/roles/docker-compose/tasks/docker-compose.yml b/roles/docker-compose/tasks/docker-compose.yml index 701c8e1b..849eaddc 100644 --- a/roles/docker-compose/tasks/docker-compose.yml +++ b/roles/docker-compose/tasks/docker-compose.yml @@ -19,4 +19,5 @@ command: "docker-compose -p {{ docker_compose_project_name }} up -d" args: chdir: "{{ docker_compose_data_dir }}" - register: result \ No newline at end of file + register: result + changed_when: "'up-to-date' not in result.stderr" diff --git a/task b/task index 92096711..b9203682 100755 --- a/task +++ b/task @@ -38,6 +38,13 @@ function update-docs() { python ./library/graph.py } +function list-hosts() { + if test -z "$1"; then echo "\$1 is empty"; exit; fi + + activate-venv + ansible -i $1 all --list-hosts +} + case "$1" in init) sudo touch /var/log/ansible.log @@ -57,6 +64,9 @@ case "$1" in update-docs) update-docs ;; + list-hosts) + list-hosts $2 + ;; lint) activate-venv ansible-lint *.yml diff --git a/task.md b/task.md index 5c5587e5..c3f7eb8c 100644 --- a/task.md +++ b/task.md @@ -6,3 +6,4 @@ | install-packages | | Install Python and Ansible dependencies. | | lint | | Lint Ansible roles and playbooks. | | update-docs | | Update project docs. | +| list-hosts | [path] | Lists all hosts of an inventory |