fix(environ): remove superfluous config dict (#301)

* fix(environ): remove superfluous config dict

* fix(jinja): corrected file.managed state

Author: noelmcloughlin

docker/files/default/config.sh.jinja docker/files/default/environ.sh.jinjadocker/files/default/config.sh.jinja renamed to docker/files/default/environ.sh.jinja

@@ -3,8 +3,8 @@
 # Your changes may be overwritten.
 ########################################################################
 
-{%- if config %}
-    {%- for line in config|unique %}
+{%- if environ %}
+    {%- for line in environ|unique %}
 {{ line }}
     {%- endfor %}
 {%- endif %}

docker/map.jinja

@@ -86,7 +86,4 @@
     {%- endfor %}
 {%- endif %}
 
-{%- if 'formula' not in d %}
-    {%- do d.update({'formula': 'docker'}) %}
-{%- endif %}
 {%- set data = d %}

docker/software/config/clean.sls

@@ -13,7 +13,6 @@ include:
 docker-software-config-clean:
   file.absent:
     - names:
-      - {{ d.pkg.docker.config_file }}
       - {{ d.pkg.docker.environ_file }}
       - {{ d.pkg.docker.daemon_config_file }}
     - require:

docker/software/config/environ.sls

@@ -16,7 +16,7 @@ include:
 docker-software-environ-file-managed-environ_file:
   file.managed:
     - name: {{ d.pkg.docker.environ_file }}
-    - source: {{ files_switch(['config.sh.jinja'],
+    - source: {{ files_switch(['environ.sh.jinja'],
                               lookup='docker-software-environ-file-managed-environ_file'
                  )
               }}
@@ -28,7 +28,7 @@ docker-software-environ-file-managed-environ_file:
               {%- endif %}
     - template: jinja
     - context:
-      config: {{ d.pkg.docker.environ|json }}
+      environ: {{ d.pkg.docker.environ|json }}
     - require:
       - sls: {{ sls_archive if d.pkg.docker.use_upstream == 'archive' else sls_desktop if d.pkg.docker.use_upstream == 'desktop' else sls_package }}
 

docker/software/config/file.sls

@@ -2,6 +2,5 @@
 # vim: ft=sls
 
 include:
-  - .file
   - .environ
   - .daemon

docker/software/config/init.sls

@@ -6,14 +6,14 @@
 
     {%- if 'service' in d.pkg.docker and d.pkg.docker.service and grains.os != 'Windows' %}
         {%- set sls_config_daemon = tplroot ~ '.software.config.daemon' %}
-        {%- set sls_config_file = tplroot ~ '.software.config.file' %}
+        {%- set sls_environ = tplroot ~ '.software.config.environ' %}
         {%- 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 }}
-  - {{ sls_config_file }}
+  - {{ sls_environ }}
   - {{ sls_config_daemon }}
 
         {%- if grains.kernel|lower == 'linux' %}
@@ -26,8 +26,8 @@ docker-software-service-running-unmasked:
       - service: docker-software-service-running-docker
     - require:
       - sls: {{ sls_config_daemon }}
-            {%- if 'config' in d.pkg.docker and d.pkg.docker.config %}
-      - sls: {{ sls_config_file }}
+            {%- if 'environ' in d.pkg.docker and d.pkg.docker.environ %}
+      - sls: {{ sls_environ }}
             {%- endif %}
             {%- if d.misc.firewall %}
   pkg.installed:
@@ -42,8 +42,8 @@ docker-software-service-running-docker:
     - name: {{ d.pkg.docker.service.name }}
     - require:
       - sls: {{ sls_config_daemon }}
-        {%- if 'config' in d.pkg.docker and d.pkg.docker.config %}
-      - sls: {{ sls_config_file }}
+        {%- if 'environ' in d.pkg.docker and d.pkg.docker.environ %}
+      - sls: {{ sls_environ }}
         {%- endif %}
     - enable: True
     - watch:

docker/software/service/running.sls

@@ -8,6 +8,8 @@ docker:
 
   pkg:
     docker:
+      # choice is 'archive' (default) or 'repo' (yum/apt)
+      use_upstream: archive   # or repo
       service:
         name: docker
         env: HTTP_PROXY=http://YOUR_PROXY_IP_ADDRESS:PROXY_PORT

pillar.example

@@ -11,7 +11,7 @@ docker:
   pkg:
     docker:
       use_upstream: package
-      config:
+      environ:
         # yamllint disable-line rule:line-length
         - OPTIONS='-s devicemapper --storage-opt dm.fs=xfs --exec-opt native.cgroupdriver=cgroupfs --selinux-enabled'
         # yamllint disable-line rule:line-length

test/salt/pillar/package.sls

@@ -11,7 +11,7 @@ docker:
   pkg:
     docker:
       use_upstream: repo
-      config:
+      environ:
         # yamllint disable-line rule:line-length
         - OPTIONS='-s devicemapper --storage-opt dm.fs=xfs --exec-opt native.cgroupdriver=cgroupfs --selinux-enabled'
         # yamllint disable-line rule:line-length