Merge "Add job for backupninja backup"
diff --git a/glusterfs/server/volume/jenkins_slave_multi.yml b/glusterfs/server/volume/jenkins_slave_multi.yml
new file mode 100644
index 0000000..d926dfc
--- /dev/null
+++ b/glusterfs/server/volume/jenkins_slave_multi.yml
@@ -0,0 +1,38 @@
+classes:
+- system.glusterfs.server.volume.jenkins_slave_single
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ jenkins_slave02:
+ storage: /srv/glusterfs/jenkins_slaves/slave02
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/jenkins_slaves/slave02
+ - ${_param:cluster_node02_address}:/srv/glusterfs/jenkins_slaves/slave02
+ - ${_param:cluster_node03_address}:/srv/glusterfs/jenkins_slaves/slave02
+ options:
+ storage.owner-gid: 10000
+ storage.owner-uid: 10000
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
+ cluster.favorite-child-policy: mtime
+ jenkins_slave03:
+ storage: /srv/glusterfs/jenkins_slaves/slave03
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/jenkins_slaves/slave03
+ - ${_param:cluster_node02_address}:/srv/glusterfs/jenkins_slaves/slave03
+ - ${_param:cluster_node03_address}:/srv/glusterfs/jenkins_slaves/slave03
+ options:
+ storage.owner-gid: 10000
+ storage.owner-uid: 10000
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
+ cluster.favorite-child-policy: mtime
diff --git a/glusterfs/server/volume/jenkins_slave_single.yml b/glusterfs/server/volume/jenkins_slave_single.yml
new file mode 100644
index 0000000..7056240
--- /dev/null
+++ b/glusterfs/server/volume/jenkins_slave_single.yml
@@ -0,0 +1,20 @@
+parameters:
+ glusterfs:
+ server:
+ volumes:
+ jenkins_slave01:
+ storage: /srv/glusterfs/jenkins_slaves/slave01
+ replica: 3
+ bricks:
+ - ${_param:cluster_node01_address}:/srv/glusterfs/jenkins_slaves/slave01
+ - ${_param:cluster_node02_address}:/srv/glusterfs/jenkins_slaves/slave01
+ - ${_param:cluster_node03_address}:/srv/glusterfs/jenkins_slaves/slave01
+ options:
+ storage.owner-gid: 10000
+ storage.owner-uid: 10000
+ cluster.readdir-optimize: On
+ nfs.disable: On
+ network.remote-dio: On
+ diagnostics.client-log-level: WARNING
+ diagnostics.brick-log-level: WARNING
+ cluster.favorite-child-policy: mtime
diff --git a/kubernetes/common/init.yml b/kubernetes/common/init.yml
index bfbd98a..d893ad1 100644
--- a/kubernetes/common/init.yml
+++ b/kubernetes/common/init.yml
@@ -71,7 +71,7 @@
kubernetes_hyperkube_image: ${_param:mcp_docker_registry}/mirantis/kubernetes/hyperkube-amd64:v1.13.2-1
kubernetes_calico_cni_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/cni:v3.3.2
kubernetes_calico_calicoctl_image: ${_param:mcp_docker_registry}/mirantis/projectcalico/calico/ctl:v3.3.2
- kubernetes_containerd_package: containerd.io=1.2.1+1-1~u16.04+mcp
+ kubernetes_containerd_package: containerd=1.2.4-2~u16.04+mcp
kubernetes_metrics_server_image: ${_param:kubernetes_metrics_server_repo}/metrics-server-amd64:v0.3.1
kubernetes_helm_tiller_image: ${_param:kubernetes_helm_tiller_repo}/tiller:v2.12.2
kubernetes_helm_client_source: ${_param:kubernetes_helm_client_repo}/helm-v2.12.2-linux-amd64.tar.gz
diff --git a/kubernetes/control/services/drivetrain/jenkins_slave_multi.yml b/kubernetes/control/services/drivetrain/jenkins_slave_multi.yml
index f0db6cf..7840d31 100644
--- a/kubernetes/control/services/drivetrain/jenkins_slave_multi.yml
+++ b/kubernetes/control/services/drivetrain/jenkins_slave_multi.yml
@@ -34,6 +34,16 @@
value: ${_param:kdt_http_proxy}
- name: no_proxy
value: ${_param:kdt_no_proxy}
+ volumes:
+ - name: jenkins-slave02
+ mount: /var/lib/jenkins
+ read_only: false
+ volume:
+ jenkins-slave02:
+ type: glusterfs
+ endpoints: glusterfs
+ path: jenkins_slave02
+ read_only: false
jenkins_slave03:
create: true
service: slave03
@@ -64,3 +74,13 @@
value: ${_param:kdt_http_proxy}
- name: no_proxy
value: ${_param:kdt_no_proxy}
+ volumes:
+ - name: jenkins-slave03
+ mount: /var/lib/jenkins
+ read_only: false
+ volume:
+ jenkins-slave03:
+ type: glusterfs
+ endpoints: glusterfs
+ path: jenkins_slave03
+ read_only: false
diff --git a/kubernetes/control/services/drivetrain/jenkins_slave_single.yml b/kubernetes/control/services/drivetrain/jenkins_slave_single.yml
index 3659689..4019c1f 100644
--- a/kubernetes/control/services/drivetrain/jenkins_slave_single.yml
+++ b/kubernetes/control/services/drivetrain/jenkins_slave_single.yml
@@ -35,3 +35,13 @@
value: ${_param:kdt_http_proxy}
- name: no_proxy
value: ${_param:kdt_no_proxy}
+ volumes:
+ - name: jenkins-slave01
+ mount: /var/lib/jenkins
+ read_only: false
+ volume:
+ jenkins-slave01:
+ type: glusterfs
+ endpoints: glusterfs
+ path: jenkins_slave01
+ read_only: false
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