commit a483aca1536536c4114205696ca483f4b727d3c7
author Jiri Broulik <jbroulik@mirantis.com> Fri Sep 08 17:15:49 2017 +0200
committer Jiri Broulik <jbroulik@mirantis.com> Mon Sep 11 11:22:23 2017 +0200
tree 3940047ee23cc8794f60260b3db65114a60306fb
parent b5a5aa610defbf7b18fe90163c16855bd22aa60b

cicd nginx proxy

Change-Id: I256e96b3c80c0e0975be235281b35c65ac364aca

nginx/server/proxy/cicd/gerrit.yml

diff --git a/nginx/server/proxy/cicd/gerrit.yml b/nginx/server/proxy/cicd/gerrit.yml
index 2593dd7..0baf26c 100644
--- a/nginx/server/proxy/cicd/gerrit.yml
+++ b/nginx/server/proxy/cicd/gerrit.yml
@@ -1,34 +1,23 @@
 parameters:
   _param:
-    nginx_proxy_gerrit_server_ssl_authority: virt
-    nginx_proxy_gerrit_server_proxy_host: ${_param:single_address}
-    nginx_proxy_gerrit_server_proxy_port: 8082
-    nginx_proxy_gerrit_server_site_host: ${linux:network:fqdn}
-    nginx_proxy_gerrit_server_site_port: 8083
+    nginx_proxy_gerrit_server_proxy_host: ${_param:cicd_control_address}
+    nginx_proxy_gerrit_server_proxy_port: 8080
+    nginx_proxy_gerrit_server_site_host: ${_param:cluster_public_host}
+    nginx_proxy_gerrit_server_site_port: 8080
   nginx:
     server:
       enabled: true
-      user:
-        admin:
-          enabled: true
-          password: password
       site:
-        nginx_proxy_gerrit_server:
+        nginx_proxy_gerrit:
           enabled: true
           type: nginx_proxy
-          name: gerrit_server
-          auth:
-            engine: basic
+          name: gerrit
           proxy:
             host: ${_param:nginx_proxy_gerrit_server_proxy_host}
             port: ${_param:nginx_proxy_gerrit_server_proxy_port}
             protocol: http
-          ssl:
-            enabled: true
-            engine: salt
-            authority: ${_param:nginx_proxy_gerrit_server_ssl_authority}
-            certificate: ${_param:nginx_proxy_gerrit_server_site_host}
-            mode: secure
           host:
             name: ${_param:nginx_proxy_gerrit_server_site_host}
             port: ${_param:nginx_proxy_gerrit_server_site_port}
+            protocol: https
+          ssl: ${_param:nginx_proxy_ssl}

nginx/server/proxy/cicd/jenkins.yml

diff --git a/nginx/server/proxy/cicd/jenkins.yml b/nginx/server/proxy/cicd/jenkins.yml
index 975cc4d..bd270f2 100644
--- a/nginx/server/proxy/cicd/jenkins.yml
+++ b/nginx/server/proxy/cicd/jenkins.yml
@@ -1,4 +1,9 @@
 parameters:
+  _param:
+    nginx_proxy_jenkins_server_proxy_host: ${_param:cicd_control_address}
+    nginx_proxy_jenkins_server_proxy_port: 8081
+    nginx_proxy_jenkins_server_site_host: ${_param:cluster_public_host}
+    nginx_proxy_jenkins_server_site_port: 8081
   nginx:
     server:
       enabled: true
@@ -8,11 +13,11 @@
           type: nginx_proxy
           name: jenkins
           proxy:
-            host: ${_param:foundation_intergration_address}
-            port: 8080
+            host: ${_param:nginx_proxy_jenkins_server_proxy_host}
+            port: ${_param:nginx_proxy_jenkins_server_proxy_port}
             protocol: http
           host:
-            name: ${_param:cluster_public_host}
-            port: 8095
+            name: ${_param:nginx_proxy_jenkins_server_site_host}
+            port: ${_param:nginx_proxy_jenkins_server_site_port}
             protocol: https
           ssl: ${_param:nginx_proxy_ssl}