refactor(jinja2): remove excessive jinja, not useful pattern (#303)

Author: noelmcloughlin

docker/compose/build.sls

@@ -3,13 +3,12 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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-{{ service }}-build:
   module.run:
     - name: dockercompose.build
     - path: {{ d.compose[service]['path'] }}

docker/compose/get.sls

@@ -3,13 +3,12 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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-{{ service }}-get:
   module.run:
     - name: dockercompose.get
     - path: {{ d.compose[service]['path'] }}

docker/compose/kill.sls

@@ -3,13 +3,12 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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-{{ service }}-kill:
   module.run:
     - name: dockercompose.kill
     - path: {{ d.compose[service]['path'] }}

docker/compose/ng.sls

@@ -4,18 +4,17 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
 include:
-  - {{ formula }}.compose.software
-  - {{ formula }}.networks
+  - docker.compose.software
+  - docker.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:
+docker-compose-ng-{{ id }}-present:
   docker_image.present:
     - force: {{ d.misc.force_present }}
         {%- if ':' in container.image %}
@@ -26,7 +25,7 @@ include:
     - name: {{ container.image }}
         {%- endif %}
 
-{{ formula }}-compose-ng-{{ id }}-running:
+docker-compose-ng-{{ id }}-running:
   docker_container.running:
     - name: {{ id }}
     - image: {{ container.image }}
@@ -126,15 +125,15 @@ include:
             {%- endfor %}
         {%- endif %}
     - require:
-      - docker_image: {{ formula }}-compose-ng-{{ id }}-present
+      - docker_image: docker-compose-ng-{{ id }}-present
         {%- if required_containers is defined %}
             {%- for containerid in required_containers %}
-      - docker_image: {{ formula }}-compose-ng-{{ id }}-present
+      - docker_image: docker-compose-ng-{{ id }}-present
             {%- endfor %}
         {%- endif %}
         {%- if required_networks is defined %}
             {%- for networkid in required_networks %}
-      - docker_network: {{ formula }}-network-{{ networkid }}-present
+      - docker_network: docker-network-{{ networkid }}-present
             {%- endfor %}
         {%- endif %}
 

docker/compose/pause.sls

@@ -3,13 +3,12 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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-{{ service }}-pause:
   module.run:
     - name: dockercompose.pause
     - path: {{ d.compose[service]['path'] }}

docker/compose/ps.sls

@@ -3,13 +3,12 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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-{{ service }}-ps:
   module.run:
     - name: dockercompose.ps
     - path: {{ d.compose[service]['path'] }}

docker/compose/pull.sls

@@ -3,13 +3,12 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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-{{ service }}-pull:
   module.run:
     - name: dockercompose.pull
     - path: {{ d.compose[service]['path'] }}

docker/compose/restart.sls

@@ -3,13 +3,12 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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-{{ service }}-restart:
   module.run:
     - name: dockercompose.restart
     - path: {{ d.compose[service]['path'] }}

docker/compose/rm.sls

@@ -3,13 +3,12 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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 }}-rm:
   module.run:
     - name: dockercompose.rm
     - path: {{ d.compose[service]['path'] }}

docker/compose/service_create.sls

@@ -3,15 +3,14 @@
 
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import data as d with context %}
-{%- set formula = d.formula %}
 
     {%- 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'] %}
 
-{{ formula }}-compose-{{ service }}-service_create:
+docker-compose-{{ service }}-service_create:
   module.run:
     - name: dockercompose.service_create
     - path: {{ d.compose[service]['path'] }}