From 438feb8a024d102dba50652d9309f159bc73cfcc Mon Sep 17 00:00:00 2001 From: Thomas Daley Date: Mon, 27 Dec 2021 21:46:58 -0800 Subject: [PATCH 1/6] Add default source to make configurable --- defaults/main.yaml | 2 +- tasks/stack_deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 778ec0b..0003d24 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,6 +1,6 @@ docker_socket: /var/run/docker.sock docker_volumes: /var/lib/docker/volumes - +docker_compose_template: docker docker_network: diesel_net docker_stack_name: '{{ repository }}_{{ version | replace("/", "-") }}' docker_stack: '{{ docker_stack_name[:64] | lower }}' # 64 char limit (docker) diff --git a/tasks/stack_deploy.yaml b/tasks/stack_deploy.yaml index 9ebe303..47daa5c 100644 --- a/tasks/stack_deploy.yaml +++ b/tasks/stack_deploy.yaml @@ -5,7 +5,7 @@ - name: render docker-compose.yaml.j2 to {{ docker_dir }}/docker-compose.yaml template: - src: docker-compose.yaml.j2 + src: '{{ docker_compose_template }}' dest: '{{ docker_dir }}/docker-compose.yaml' mode: '0740' From 1ab09057773d0ed469739f5409399aa7d7aee44f Mon Sep 17 00:00:00 2001 From: Thomas Daley Date: Wed, 5 Jan 2022 18:22:07 -0800 Subject: [PATCH 2/6] Add variable default. Make compose template file path configurable for docker stack deploy task list --- defaults/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 0003d24..d417c74 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,6 +1,6 @@ docker_socket: /var/run/docker.sock docker_volumes: /var/lib/docker/volumes -docker_compose_template: docker +docker_compose_template: docker-compose.yaml.j2 docker_network: diesel_net docker_stack_name: '{{ repository }}_{{ version | replace("/", "-") }}' docker_stack: '{{ docker_stack_name[:64] | lower }}' # 64 char limit (docker) From a946768d6384c48d3e7da483c457f51bf4168ac4 Mon Sep 17 00:00:00 2001 From: Thomas Daley Date: Thu, 6 Jan 2022 20:46:05 -0800 Subject: [PATCH 3/6] remove docker_network variable default --- defaults/main.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index d417c74..f045fc8 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,7 +1,6 @@ docker_socket: /var/run/docker.sock docker_volumes: /var/lib/docker/volumes docker_compose_template: docker-compose.yaml.j2 -docker_network: diesel_net docker_stack_name: '{{ repository }}_{{ version | replace("/", "-") }}' docker_stack: '{{ docker_stack_name[:64] | lower }}' # 64 char limit (docker) docker_registry: docker.nexus.diesel.net From 2d753c60d5d63f81d4b63887704ead0c16565bac Mon Sep 17 00:00:00 2001 From: Thomas Daley Date: Thu, 6 Jan 2022 21:24:32 -0800 Subject: [PATCH 4/6] start pin-locking deps --- meta/main.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/main.yaml b/meta/main.yaml index 3cea2fc..3bcfbd3 100644 --- a/meta/main.yaml +++ b/meta/main.yaml @@ -14,4 +14,7 @@ galaxy_info: - host dependencies: - - common + - name: common + scm: git + src: "git@github.com:Diesel-Net/ansible-role-common.git" + version: 1.2.0 From 9c311049429c7543d44d08791166c96cdd34235d Mon Sep 17 00:00:00 2001 From: Thomas Daley Date: Fri, 21 Jan 2022 16:36:25 -0800 Subject: [PATCH 5/6] make docker system prunes more verbose --- tasks/system_prune.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tasks/system_prune.yaml b/tasks/system_prune.yaml index d29bed4..3ca6322 100644 --- a/tasks/system_prune.yaml +++ b/tasks/system_prune.yaml @@ -3,3 +3,7 @@ docker system prune --force {{ options }} vars: options: '' + register: prune_output + +- debug: + msg: '{{ prune_output.stdout_lines }}' From 356de147adb86ee2c9301c1ff3e202ca7e20a698 Mon Sep 17 00:00:00 2001 From: Thomas Daley Date: Fri, 21 Jan 2022 17:12:38 -0800 Subject: [PATCH 6/6] use automation_user variable from ubuntu role. make ubuntu a "loose" dependency --- meta/main.yaml | 1 + tasks/install.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/main.yaml b/meta/main.yaml index 3bcfbd3..6accd1e 100644 --- a/meta/main.yaml +++ b/meta/main.yaml @@ -18,3 +18,4 @@ dependencies: scm: git src: "git@github.com:Diesel-Net/ansible-role-common.git" version: 1.2.0 + - ubuntu diff --git a/tasks/install.yaml b/tasks/install.yaml index 8865a8b..23edf00 100644 --- a/tasks/install.yaml +++ b/tasks/install.yaml @@ -160,7 +160,7 @@ become: yes - name: "add user to the docker group" - command: "usermod -aG docker {{ user }}" + command: "usermod -aG docker {{ automation_user }}" become: yes - name: reset ssh connection to allow user changes to affect 'current login user'