Fix visualizer site port and allow overriding
Change-Id: Ifd118f7623c051794a6c0e1ade84b4564af07d28
diff --git a/haproxy/proxy/listen/cicd/aptly.yml b/haproxy/proxy/listen/cicd/aptly.yml
index c1062ed..64115ff 100644
--- a/haproxy/proxy/listen/cicd/aptly.yml
+++ b/haproxy/proxy/listen/cicd/aptly.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_aptly_api_bind_port: 8084
+ haproxy_aptly_public_bind_port: 8085
haproxy:
proxy:
listen:
@@ -11,7 +14,7 @@
balance: source
binds:
- address: ${_param:haproxy_bind_address}
- port: 8084
+ port: ${_param:haproxy_aptly_api_bind_port}
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
@@ -34,7 +37,7 @@
balance: source
binds:
- address: ${_param:haproxy_bind_address}
- port: 8085
+ port: ${_param:haproxy_aptly_public_bind_port}
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
diff --git a/haproxy/proxy/listen/cicd/gerrit.yml b/haproxy/proxy/listen/cicd/gerrit.yml
index efa7ed9..5fe60a4 100644
--- a/haproxy/proxy/listen/cicd/gerrit.yml
+++ b/haproxy/proxy/listen/cicd/gerrit.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_gerrit_bind_port: 8080
+ haproxy_gerrit_ssh_bind_port: 29417
haproxy:
proxy:
listen:
@@ -12,7 +15,7 @@
balance: source
binds:
- address: ${_param:haproxy_bind_address}
- port: 8080
+ port: ${_param:haproxy_gerrit_bind_port}
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
@@ -31,7 +34,7 @@
balance: source
binds:
- address: ${_param:haproxy_bind_address}
- port: 29418
+ port: ${_param:haproxy_gerrit_ssh_bind_port}
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
diff --git a/haproxy/proxy/listen/cicd/jenkins.yml b/haproxy/proxy/listen/cicd/jenkins.yml
index d907ee3..e91d9f2 100644
--- a/haproxy/proxy/listen/cicd/jenkins.yml
+++ b/haproxy/proxy/listen/cicd/jenkins.yml
@@ -1,4 +1,7 @@
parameters:
+ _param:
+ haproxy_jenkins_bind_port: 8081
+ haproxy_jenkins_jnlp_bind_port: 50000
haproxy:
proxy:
listen:
@@ -14,7 +17,7 @@
- action: "del-header X-Frame-Options"
binds:
- address: ${_param:haproxy_bind_address}
- port: 8081
+ port: ${_param:haproxy_jenkins_bind_port}
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
@@ -33,7 +36,7 @@
balance: source
binds:
- address: ${_param:haproxy_bind_address}
- port: 50000
+ port: ${_param:haproxy_jenkins_jnlp_bind_port}
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
diff --git a/haproxy/proxy/listen/cicd/mysql.yml b/haproxy/proxy/listen/cicd/mysql.yml
index c6fa56b..639f3c3 100644
--- a/haproxy/proxy/listen/cicd/mysql.yml
+++ b/haproxy/proxy/listen/cicd/mysql.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_mysql_bind_port: 8081
haproxy:
proxy:
listen:
@@ -7,7 +9,7 @@
balance: source
binds:
- address: ${_param:haproxy_bind_address}
- port: 3306
+ port: ${_param:haproxy_mysql_bind_port}
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
diff --git a/haproxy/proxy/listen/docker/registry.yml b/haproxy/proxy/listen/docker/registry.yml
index c3d1893..2a86aa4 100644
--- a/haproxy/proxy/listen/docker/registry.yml
+++ b/haproxy/proxy/listen/docker/registry.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_docker_registry_listen_port: 5000
haproxy:
proxy:
listen:
@@ -14,7 +16,7 @@
condition: "if { ssl_fc }"
binds:
- address: ${_param:haproxy_bind_address}
- port: 5000
+ port: ${_param:haproxy_docker_registry_listen_port}
ssl: ${_param:cluster_ssl_certificate}
servers:
- name: ${_param:cluster_node01_name}
diff --git a/haproxy/proxy/listen/docker/visualizer.yml b/haproxy/proxy/listen/docker/visualizer.yml
index daacd84..409815c 100644
--- a/haproxy/proxy/listen/docker/visualizer.yml
+++ b/haproxy/proxy/listen/docker/visualizer.yml
@@ -1,4 +1,6 @@
parameters:
+ _param:
+ haproxy_docker_visualizer_listen_port: 8091
haproxy:
proxy:
listen:
@@ -12,7 +14,7 @@
balance: source
binds:
- address: ${_param:haproxy_bind_address}
- port: 8090
+ port: ${_param:haproxy_docker_visualizer_listen_port}
servers:
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}