commit fd293c45df60b5f9b17f055c6ad34a59cf8ca35a
author Ilya Kharin <ikharin@mirantis.com> Tue Mar 14 17:34:12 2017 +0400
committer Ilya Kharin <ikharin@mirantis.com> Thu Mar 16 15:53:45 2017 +0400
tree 94e2225832ee24b33a662d76a8048009de504904
parent ced98392f712514494f748d73c9a91ae3583897a

Rename control into config

Change-Id: I13ef171b9294d607e590db6b8d96019477e72c71

devops_portal/setup/kubernetes.sls

diff --git a/devops_portal/setup/kubernetes.sls b/devops_portal/setup/kubernetes.sls
index 375d183..ecafbe1 100644
--- a/devops_portal/setup/kubernetes.sls
+++ b/devops_portal/setup/kubernetes.sls
@@ -1,10 +1,10 @@
-{%- from "devops_portal/map.jinja" import control with context %}
-{%- if control.setup.engine == "kubernetes" %}
-{%- set namespace = control.setup.kubernetes.namespace|default("oss") %}
+{%- from "devops_portal/map.jinja" import config with context %}
+{%- if config.setup.engine == "kubernetes" %}
+{%- set namespace = config.setup.kubernetes.namespace|default("oss") %}
 
 devops_portal_kubernetes_dir:
   file.directory:
-    - name: /srv/oss/devops_portal/kubernetes
+    - name: {{ config.base_dir }}/kubernetes
     - user: root
     - group: root
     - mode: 0755
@@ -12,7 +12,7 @@
 
 devops_portal_k8s_svc:
   file.managed:
-    - name: /srv/oss/devops_portal/kubernetes/devops_portal-svc.yaml
+    - name: {{ config.base_dir }}/kubernetes/devops_portal-svc.yaml
     - source: salt://devops_portal/files/kubernetes/devops_portal-svc.yaml
     - template: jinja
     - require:
@@ -20,7 +20,7 @@
 
 devops_portal_k8s_cm:
   file.managed:
-    - name: /srv/oss/devops_portal/kubernetes/devops_portal-cm.yaml
+    - name: {{ config.base_dir }}/kubernetes/devops_portal-cm.yaml
     - source: salt://devops_portal/files/kubernetes/devops_portal-cm.yaml
     - template: jinja
     - require:
@@ -30,7 +30,7 @@
 
 devops_portal_k8s_deploy:
   file.managed:
-    - name: /srv/oss/devops_portal/kubernetes/devops_portal-deploy.yaml
+    - name: {{ config.base_dir }}/kubernetes/devops_portal-deploy.yaml
     - source: salt://devops_portal/files/kubernetes/devops_portal-deploy.yaml
     - template: jinja
     - require:
@@ -45,9 +45,9 @@
 apply_devops_portal:
   cmd.run:
     - name: hyperkube kubectl apply
-            --filename /srv/oss/devops_portal/kubernetes/devops_portal-svc.yaml
-            --filename /srv/oss/devops_portal/kubernetes/devops_portal-cm.yaml
-            --filename /srv/oss/devops_portal/kubernetes/devops_portal-deploy.yaml
+            --filename {{ config.base_dir }}/kubernetes/devops_portal-svc.yaml
+            --filename {{ config.base_dir }}/kubernetes/devops_portal-cm.yaml
+            --filename {{ config.base_dir }}/kubernetes/devops_portal-deploy.yaml
             --namespace={{ namespace }}
             --record
     - require: