Page MenuHomeDevCentral
Files F25009388

D2084.diff
No OneTemporary
Actions

D2084.diff
View Options

diff --git a/_modules/paas_docker.py b/_modules/paas_docker.py
--- a/_modules/paas_docker.py
+++ b/_modules/paas_docker.py
@@ -123,6 +123,30 @@
return any(["host" in container for _, container in full_service.items()])
+def get_upstreams():
+ """
+ A function to output a hashmap of applications URLs.
+
+ State Example::
+
+ {% upstreams = salt['paas_docker.get_upstreams']() %}
+ """
+ upstreams = {}
+
+ server = __grains__["fqdn"]
+ url = "http://" + server
+ for app in __pillar__["docker_containers"]:
+ upstreams_to_add = {
+ key: url + ":" + str(args["app_port"])
+ for key, args in __pillar__["docker_containers"][app].items()
+ if "app_port" in args
+ }
+
+ upstreams.update(upstreams_to_add)
+
+ return upstreams
+
+
# -------------------------------------------------------------
# Monitoring
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/roles/webserver-alkane/nginx/config.sls b/roles/webserver-alkane/nginx/config.sls
--- a/roles/webserver-alkane/nginx/config.sls
+++ b/roles/webserver-alkane/nginx/config.sls
@@ -29,6 +29,7 @@
file.directory:
- mode: 711
+{% set upstreams = salt["paas_docker.get_upstreams"]() %}
{% for domain, subdomains in pillar["nginx_vhosts"].items() %}
{{ dirs.etc }}/nginx/vhosts/{{ domain }}:
@@ -43,6 +44,7 @@
- template: jinja
- context:
services: {{ pillar["nasqueron_services"] }}
+ upstreams: {{ upstreams }}
{% endfor %}
{% endfor %}
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf
@@ -23,7 +23,7 @@
}
upstream docker-prod-registry {
- server {{ services["docker"]["api"] }}:20080;
+ server {{ upstreams["api-docker-registry"] }};
}
upstream vault {
diff --git a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
--- a/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
+++ b/roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf
@@ -15,7 +15,7 @@
# </auto-generated>
upstream tommy_cd {
- server {{ services["docker"]["cd"] }}:24180;
+ server {{ upstreams["jenkins_cd"] }};
}
server {

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 26, 01:13 (21 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3562983
Default Alt Text
D2084.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator