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/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 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
@@ -78,10 +77,21 @@ docker:
  source_hash: '3c96b57ea8e0027aee7e1a3023f7599bcecae54e77bcfd5f4e65a59672637e54'
 
  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 +107,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/map.jinja

@@ -32,8 +32,8 @@
  %}
 {%- set d = salt['grains.filter_by']( {'defaults': defaults}, default='defaults', merge=_config) %}
 
-{%- if 'wanted' in d and d.wanted and 'comp' in d.wanted and d.wanted.comp and 'supported' in d and d.supported %}
- {%- for c in d.wanted.comp %}
+{%- if 'wanted' in d and d.wanted and 'supported' in d and d.supported %}
+ {%- for c in d.wanted %}
 
  {%- if c in d.supported %}
  {%- set path = d.dir.base %}

docker/software/service/running.sls

@@ -27,7 +27,7 @@ include:
  - require:
  - sls: {{ sls_config_file }}
  {%- endif %}
- {%- if d.wanted.firewall %}
+ {%- if d.misc.firewall %}
  pkg.installed:
  - name: firewalld
  - reload_modules: true
@@ -62,7 +62,7 @@ include:
  - onfail:
  - service: {{ formula }}-software-service-running-docker
 
- {%- if d.wanted.firewall and d.pkg.docker.firewall.ports %}
+ {%- if d.misc.firewall and d.pkg.docker.firewall.ports %}
 
 {{ formula }}-software-service-running-docker:
  service.running:

docker/swarm/clean.sls

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

docker/swarm/create_service.sls

@@ -0,0 +1,16 @@
+# -*- 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 'service_create' in d.swarm and d.swarm.service_create is mapping %}
+ {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
+
+{{ formula }}-swarm-service_create:
+ module.run:
+ - name: swarm.service_create
+ {{- format_kwargs(d.swarm.service_create|unique) }}
+
+ {%- endif %}

docker/swarm/init.sls

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

docker/swarm/joinswarm.sls

@@ -0,0 +1,16 @@
+# -*- 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 'joinswarm' in d.swarm and d.swarm.joinswarm is mapping %}
+ {%- from tplroot ~ "/files/macros.jinja" import format_kwargs with context %}
+
+{{ formula }}-swarm-joinswarm:
+ module.run:
+ - name: swarm.joinswarm
+ {{- format_kwargs(d.swarm.joinswarm|unique) }}
+
+ {%- endif %}

docker/swarm/leaveswarm.sls

@@ -0,0 +1,15 @@
+# -*- 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 'leave_swarm' in d.swarm and d.swarm.leave_swarm %}
+
+{{ formula }}-swarm-leave_swarm:
+ module.run:
+ - name: swarm.leave_swarm
+ - force: true
+
+ {%- endif %}