Collect metadata of services at config:service
Change-Id: Ie2504977559c748df399f5d04663c3b415b50e09
diff --git a/devops_portal/files/config.json b/devops_portal/files/config.json
index cf0b5cb..e1d4414 100644
--- a/devops_portal/files/config.json
+++ b/devops_portal/files/config.json
@@ -11,7 +11,7 @@
{%- endmacro %}
{
"services": {
- {%- for service_name, service in salt['devops_utils.iter_items'](services, config.services) %}
+ {%- for service_name, service in salt['devops_utils.iter_items'](services, config.service) %}
{%- if not loop.first %},{% endif -%}
{%- if service|length() > 0 and service.enabled %}
"{{ service_name }}": {
diff --git a/devops_portal/files/nginx.conf b/devops_portal/files/nginx.conf
index ca27f0d..5b2a41c 100644
--- a/devops_portal/files/nginx.conf
+++ b/devops_portal/files/nginx.conf
@@ -42,8 +42,8 @@
}
{%- for service_name in services %}
-{%- if config.services[service_name] is defined %}
-{%- set service = config.services[service_name] %}
+{%- if config.service[service_name] is defined %}
+{%- set service = config.service[service_name] %}
{%- if service.enabled|default(False) and service.configure_proxy|default(False) %}
location /api/{{ service_name }} {