Prametrize location of configuration files
Change-Id: I6fb4b09cf6ce760f865e720a0077321e805fa65a
diff --git a/devops_portal/control.sls b/devops_portal/control.sls
index d321637..026b899 100644
--- a/devops_portal/control.sls
+++ b/devops_portal/control.sls
@@ -4,8 +4,8 @@
devops_portal_dirs:
file.directory:
- names:
- - /srv/oss/devops_portal/nginx
- - /srv/oss/devops_portal/config
+ - {{ control.base_dir }}/nginx
+ - {{ control.base_dir }}/config
- user: root
- group: root
- mode: 0755
@@ -13,7 +13,7 @@
devops_portal_nginx_conf:
file.managed:
- - name: /srv/oss/devops_portal/nginx/nginx.conf
+ - name: {{ control.base_dir }}/nginx/nginx.conf
- source: salt://devops_portal/files/nginx.conf
- template: jinja
- user: root
@@ -24,7 +24,7 @@
devops_portal_config:
file.managed:
- - name: /srv/oss/devops_portal/config/config.json
+ - name: {{ control.base_dir }}/config/config.json
- source: salt://devops_portal/files/config.json
- template: jinja
- user: root
diff --git a/devops_portal/map.jinja b/devops_portal/map.jinja
index 935a0db..966037c 100644
--- a/devops_portal/map.jinja
+++ b/devops_portal/map.jinja
@@ -1,5 +1,7 @@
{% set control = salt['pillar.get']('devops_portal:setup') %}
-{% set control = salt['pillar.get']('devops_portal:control') %}
+{% set control = salt['pillar.get']('devops_portal:control', default={
+ "base_dir": "/srv/volumes/devops_portal",
+}, merge=True) %}
{% set services = [
'artifactory',