commit 656e78edcfb80c80d0cb3d1615157c5029c2f21e
author Vasyl Saienko <vsaienko@mirantis.com> Mon Aug 27 11:19:06 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Mon Aug 27 11:19:07 2018 +0000
tree 4e59c675a9cf331cc1072e972be848da0920c5ce
parent 26ad3fd4f072a20d2b8601b76aeb2435a827058c
parent cd176b78de09d878f945a2bcbd43fffcae65787c

Merge "Disable fernet key rotation under root"

kubernetes/common.yml

diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index 9631f43..639154e 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -63,6 +63,13 @@
     kubernetes_contrail_network_controller_enabled: false
     kubernetes_metallb_enabled: false
     kubernetes_sriov_enabled: false
+    kubernetes_fluentd_enabled: false
+
+    # the rest of fluentd related params, the non bools
+    kubernetes_fluentd_aggregator_bind_port: 24224
+    kubernetes_fluentd_aggregator_es_host: 127.0.0.1
+    kubernetes_fluentd_aggregator_es_port: 9200
+    kubernetes_fluentd_aggregator_es_scheme: http
 
   docker:
     host:
@@ -105,6 +112,15 @@
           image: ${_param:kubernetes_contrail_network_controller_image}
         flannel:
           image: ${_param:kubernetes_flannel_image}
+        fluentd:
+          enabled: ${_param:kubernetes_fluentd_enabled}
+          aggregator:
+            bind:
+              port: ${_param:kubernetes_fluentd_aggregator_bind_port}
+            es:
+              host: ${_param:kubernetes_fluentd_aggregator_es_host}
+              port: ${_param:kubernetes_fluentd_aggregator_es_port}
+              scheme: ${_param:kubernetes_fluentd_aggregator_es_scheme}
         virtlet:
           enabled: ${_param:kubernetes_virtlet_enabled}
           namespace: kube-system

nginx/server/stream/gerrit_ssh.yml

diff --git a/nginx/server/stream/gerrit_ssh.yml b/nginx/server/stream/gerrit_ssh.yml
new file mode 100644
index 0000000..13b7ba2
--- /dev/null
+++ b/nginx/server/stream/gerrit_ssh.yml
@@ -0,0 +1,16 @@
+parameters:
+  _param:
+    nginx_proxy_gerrit_server_stream_host: ${_param:cicd_control_address}
+    nginx_proxy_gerrit_server_stream_port: 29418
+    nginx_proxy_gerrit_server_site_stream_port: 29418
+  nginx:
+    server:
+      stream:
+        gerrit_ssh:
+          backend:
+            cicd:
+              address: ${_param:nginx_proxy_gerrit_server_stream_host}
+              port: ${_param:nginx_proxy_gerrit_server_stream_port}
+          host:
+            port: ${_param:nginx_proxy_gerrit_server_site_stream_port}
+