diff --git a/defaults/main.yaml b/defaults/main.yaml index 778ec0b..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_network: diesel_net +docker_compose_template: docker-compose.yaml.j2 docker_stack_name: '{{ repository }}_{{ version | replace("/", "-") }}' docker_stack: '{{ docker_stack_name[:64] | lower }}' # 64 char limit (docker) docker_registry: docker.nexus.diesel.net diff --git a/meta/main.yaml b/meta/main.yaml index 3cea2fc..6accd1e 100644 --- a/meta/main.yaml +++ b/meta/main.yaml @@ -14,4 +14,8 @@ galaxy_info: - host dependencies: - - common + - name: common + 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' 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' 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 }}'