Merge "Add glusterfs volumes to jenkins slaves on KDT"
diff --git a/kubernetes/control/services/drivetrain/init.yml b/kubernetes/control/services/drivetrain/init.yml
index b0c51fc..2702393 100644
--- a/kubernetes/control/services/drivetrain/init.yml
+++ b/kubernetes/control/services/drivetrain/init.yml
@@ -7,13 +7,4 @@
_param:
kdt_http_proxy: ""
kdt_https_proxy: "${_param:kdt_http_proxy}"
- kdt_no_proxy: ""
- kubernetes:
- control:
- images:
- - ${_param:docker_image_phpldapadmin}
- - ${_param:docker_image_openldap}
- - ${_param:docker_image_mysql}
- - ${_param:docker_image_gerrit}
- - ${_param:docker_image_jenkins}
- - ${_param:docker_image_jenkins_slave}
+ kdt_no_proxy: ""
\ No newline at end of file
diff --git a/kubernetes/pool/images/drivetrain.yml b/kubernetes/pool/images/drivetrain.yml
new file mode 100644
index 0000000..94f5302
--- /dev/null
+++ b/kubernetes/pool/images/drivetrain.yml
@@ -0,0 +1,10 @@
+parameters:
+ kubernetes:
+ pool:
+ images:
+ - ${_param:docker_image_gerrit}
+ - ${_param:docker_image_jenkins_slave}
+ - ${_param:docker_image_jenkins}
+ - ${_param:docker_image_openldap}
+ - ${_param:docker_image_phpldapadmin}
+ - ${_param:docker_image_mysql}
\ No newline at end of file
diff --git a/nginx/server/proxy/drivetrain.yml b/nginx/server/proxy/drivetrain.yml
new file mode 100644
index 0000000..1abcc54
--- /dev/null
+++ b/nginx/server/proxy/drivetrain.yml
@@ -0,0 +1,18 @@
+parameters:
+ _param:
+ metallb_address: ${_param:kdt_metallb_address}
+ nginx:
+ server:
+ enabled: true
+ site:
+ nginx_drivetrain_proxy:
+ enabled: true
+ type: nginx_proxy
+ name: drivetrain
+ proxy:
+ host: ${_param:metallb_address}
+ port: 80
+ protocol: http
+ host:
+ name: ${_param:metallb_address}
+ port: 80
\ No newline at end of file