wip

ansible/roles/docker/tasks/config.yml

@@ -12,8 +12,8 @@
     docker_daemon_config: "{{ lookup('file',docker_daemon_config_file)|default('{}')|from_json}}"
   ignore_errors: true
 
-- name: config - add docker daemon storage configuration for btrfs
-  when: docker_package|length > 0
+- name: config - add docker daemon storage configuration
+  when: false and docker_package|length > 0
   template:
     src: daemon.json.j2
     dest: "{{docker_daemon_config_file}}"

ansible/roles/docker/tasks/myos.yml

@@ -3,7 +3,7 @@
 
 - name: myos - register myos.tags
   set_fact:
-    myos_tags: "{{ lookup('env', 'MYOS_TAGS_JSON')|from_json or lookup('file', '~/.env') }}"
+    myos_tags: "{{ lookup('env', 'MYOS_TAGS_JSON')|from_json }}"
   tags: debug
 
 - debug:

ansible/roles/docker/tasks/packages.yml

@@ -2,6 +2,7 @@
 # file: tasks/packages.yml
 
 - name: packages - install/remove docker packages
+  when: docker_packages is defined
   with_items: "{{ docker_packages|default([]) }}"
   package: name="{{item.name}}" state="{{item.state}}"
   become: yes

ansible/roles/docker/tasks/services.yml

@@ -2,7 +2,7 @@
 # file: tasks/services.yml
 
 - name: services - enable/disable docker services
-  when: ansible_service_mgr|lower != "openrc"
+  when: docker_services is defined and ansible_service_mgr|lower != "openrc"
   with_items: "{{ docker_services|default([]) }}"
   service:
     name: "{{item.name}}"
@@ -11,13 +11,13 @@
   become: yes
 
 - name: services - openrc - force service status
-  when: ansible_service_mgr|lower == "openrc"
+  when: docker_services is defined and ansible_service_mgr|lower == "openrc"
   shell: "kill -0 $(cat /run/{{item.name}}.pid) && [ ! -h /run/openrc/started/{{item.name}} ] && ln -s /etc/init.d/{{item.name}} /run/openrc/started/{{item.name}} && service {{item.name}} restart ||:"
   with_items: "{{ docker_services|default([]) }}"
   become: yes
 
 - name: services - openrc - enable/disable docker services
-  when: ansible_service_mgr|lower == "openrc"
+  when: docker_services is defined and ansible_service_mgr|lower == "openrc"
   with_items: "{{ docker_services|default([]) }}"
   service:
     name: "{{item.name}}"