feat(swarm): fix containers; basic swarm module support

docker/compose/build.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-build:

docker/compose/get.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-get:

docker/compose/kill.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-kill:

docker/compose/networks/clean.sls

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import data as d with context %}
+{%- set formula = d.formula %}
+
+    {%- if 'networks' in d and d.networks %}
+        {%- set sls_archive = tplroot ~ '.software.archive.install' %}
+        {%- set sls_desktop = tplroot ~ '.software.desktop.install' %}
+        {%- set sls_package = tplroot ~ '.software.package.install' %}
+
+include:
+  - {{ sls_archive if d.pkg.docker.use_upstream == 'archive' else sls_desktop if d.pkg.docker.use_upstream == 'desktop' else sls_package }}
+
+        {%- for name in docker.networks %}
+
+{{ formula }}-network-{{ name }}-absent:
+  docker_network.absent:
+    - name: {{ name }}
+
+        {%- endfor %}

docker/compose/networks/init.sls

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .install

docker/compose/networks/install.sls

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import data as d with context %}
+{%- set formula = d.formula %}
+
+    {%- if 'networks' in d and d.networks %}
+        {%- set sls_archive = tplroot ~ '.software.archive.install' %}
+        {%- set sls_desktop = tplroot ~ '.software.desktop.install' %}
+        {%- set sls_package = tplroot ~ '.software.package.install' %}
+
+include:
+  - {{ sls_archive if d.pkg.docker.use_upstream == 'archive' else sls_desktop if d.pkg.docker.use_upstream == 'desktop' else sls_package }}
+
+        {%- for name in docker.networks %}
+
+{{ formula }}-network-{{ name }}-present:
+  docker_network.present:
+    - name: {{ name }}
+
+        {%- endfor %}

docker/compose/ng.sls

@@ -8,10 +8,12 @@
 
 include:
   - {{ formula }}.compose.software
+  - {{ formula }}.compose.networks
 
     {%- for name, container in d.compose.ng.items() %}
         {%- set id = container.container_name|d(name) %}
         {%- set required_containers = [] %}
+        {%- set required_networks = [] %}
 
 {{ formula }}-compose-ng-{{ id }}-present:
         {%- if 'deps' in d.pkg and d.pkg.deps %}
@@ -38,6 +40,8 @@ include:
     - skip_translate: {{ d.misc.skip_translate }}
     - force: {{ d.misc.force_running }}
     - privileged: {{ container.privileged|default(False) }}
+    - interactive: {{ container.stdin_open|default(False) }}
+    - tty: {{ container.tty|default(False) }}
         {%- if 'command' in container %}
     - command: {{ container.command }}
         {%- endif %}
@@ -102,6 +106,13 @@ include:
         {{ name }}: {{ alias }}
             {%- endfor %}
         {%- endif %}
+        {%- if 'networks' in container %}
+    - networks:
+            {%- for network in container.networks %}
+                {%- do required_networks.append(network) %}
+      - {{ network }}
+            {%- endfor %}
+        {%- endif %}
         {%- if 'restart' in container %}
             {%- set policy = container.restart.split(':',1) %}
             {%- if policy|length < 2 %}
@@ -117,5 +128,10 @@ include:
       - docker_image: {{ formula }}-compose-ng-{{ id }}-present
             {%- endfor %}
         {%- endif %}
+        {%- if required_networks is defined %}
+            {%- for networkid in required_networks %}
+      - docker_network: {{ networkid }}
+            {%- endfor %}
+        {%- endif %}
 
      {% endfor %}

docker/compose/pause.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-pause:

docker/compose/ps.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-ps:

docker/compose/pull.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-pull:

docker/compose/restart.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-restart:

docker/compose/rm.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-rm:

docker/compose/service_create.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
                 {%- if 'service_name' in d.compose[service] and d.compose[service]['service_name'] %}
                     {%- if 'definition' in d.compose[service] and d.compose[service]['definition'] %}

docker/compose/service_remove.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
                 {%- if 'service_name' in d.compose[service] and d.compose[service]['service_name'] %}
 

docker/compose/service_set_tag.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
                 {%- if 'service_name' in d.compose[service] and d.compose[service]['service_name'] %}
                     {%- if 'tag' in d.compose[service] and d.compose[service]['tag'] %}

docker/compose/service_upsert.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
                 {%- if 'service_name' in d.compose[service] and d.compose[service]['service_name'] %}
                     {%- if 'definition' in d.compose[service] and d.compose[service]['definition'] %}

docker/compose/start.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-start:

docker/compose/stop.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-stop:

docker/compose/unpause.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-unpause:

docker/compose/up.sls

@@ -5,8 +5,8 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.compose and d.compose.wanted %}
-        {%- for service in d.compose.wanted|unique %}
+    {%- if 'applications' in d.compose and d.compose.applications %}
+        {%- for service in d.compose.applications|unique %}
             {%- if 'path' in d.compose[service] and d.compose[service]['path'] %}
 
 {{ formula }}-compose-{{ service }}-up:

docker/containers/absent.sls

@@ -6,10 +6,17 @@
 {%- set formula = d.formula %}
 {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
 
-    {%- if 'wanted' in d.containers and d.containers.wanted %}
+    {%- if 'running' in d.containers and d.containers.running %}
+        {%- set sls_stopped = tplroot ~ '.containers.stopped' %}
+
+include:
+  - {{ sls_stopped }}
+
 
 {{ formula }}-containers-absent:
   docker_container.absent:
-    - names: {{ d.containers.wanted|unique|json }}
+    - names: {{ d.containers.running|unique|json }}
+    - require:
+      - sls: {{ sls_stopped }}
 
     {%- endif %}

docker/containers/running.sls

@@ -6,8 +6,8 @@
 {%- set formula = d.formula %}
 {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
 
-    {%- if 'wanted' in d.containers and d.containers.wanted %}
-        {%- for c in d.containers.wanted|unique %}
+    {%- if 'running' in d.containers and d.containers.running %}
+        {%- for c in d.containers.running|unique %}
             {%- if c in d.containers and d.containers[c] %}
 
 {{ formula }}-containers-{{ c }}-running:

docker/containers/stopped.sls

@@ -5,10 +5,13 @@
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
 {%- set formula = d.formula %}
 
-    {%- if 'wanted' in d.containers and d.containers.wanted %}
+    {%- if 'running' in d.containers and d.containers.running %}
+        {%- for c in d.containers.running|unique %}
 
-{{ formula }}-containers-stopped:
+{{ formula }}-containers-{{ c }}-stopped:
   docker_container.stopped:
-    - containers: {{ d.containers.wanted|unique|json }}
+    - name: {{ c }}
+    - onlyif: docker container inspect {{ c }}
 
+        {%- endfor %}
     {%- endif %}

docker/defaults.yaml

@@ -7,11 +7,10 @@ docker:
   supported:
     - docker
     - compose
+    - swarm
   wanted:
-    comp:
-      - docker
-      - compose
-    firewall: false
+    - docker
+    - compose
 
   pkg:
     version: 'latest'  # linux native package version
@@ -77,11 +76,23 @@ docker:
         source: 'https://dl.bintray.com/docker-compose/master/docker-compose-Linux-x86_64'
         source_hash: '3c96b57ea8e0027aee7e1a3023f7599bcecae54e77bcfd5f4e65a59672637e54'
 
+  networks: {}
   containers:
-    wanted: {}
+    running: []
   compose:
-    wanted: {}
+    applications: []
     ng: {}
+  swarm:
+    joinswarm: {}
+    leave_swarm: false
+    node_ls: {}
+    remove_node: {}
+    remove_service: {}
+    service_create: {}
+    swarm_init: {}
+    service_info: {}
+    swarm_tokens: true
+    update_node: {}
 
   dir:
     base: /usr/local
@@ -97,12 +108,14 @@ docker:
   arch: ''
 
   misc:
-    skip_translate: None
+    force_absent: false
     force_present: false
     force_running: false
+    skip_translate: None
     clean: false
     reload: true
     refresh: true
+    firewall: false
     hold: false
 
   retry_option:

docker/files/macros.jinja

@@ -4,11 +4,13 @@
 # Collection of common macros
 
 {%- macro format_kwargs(kwarg) -%}
+  {%- if kwarg and kwarg is mapping %}
 
   {%- filter indent(4) %}
     {%- for k, v in kwarg|dictsort() %}
 - {{ k }}: {{ v }}
     {%- endfor %}
   {%- endfilter %}
 
+  {%- endif %}
 {%- endmacro %}