Merge pull request #18 from Diesel-Net/development

Promotion

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

meta/main.yaml

@@ -14,4 +14,8 @@ galaxy_info:
     - host
 
 dependencies:
-  - common
+  - name: common
+    scm: git
+    src: "[email protected]:Diesel-Net/ansible-role-common.git"
+    version: 1.2.0
+  - ubuntu

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'

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'
 

tasks/system_prune.yaml

@@ -3,3 +3,7 @@
     docker system prune --force {{ options }}
   vars:
     options: ''
+  register: prune_output
+
+- debug:
+    msg: '{{ prune_output.stdout_lines }}'