Merge "Added required params for k8s fluentd"
diff --git a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
new file mode 100644
index 0000000..2e509f1
--- /dev/null
+++ b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
@@ -0,0 +1,46 @@
+parameters:
+ _param:
+ mcp_docker_registry: 'docker-prod-local.artifactory.mirantis.com'
+ docker_image_elasticsearch: ${_param:mcp_docker_registry}/mirantis/external/elasticsearch:nightly
+ elasticsearch_client_node_publish_host: ${_param:cluster_public_host}
+ elasticsearch_cluster_name: elasticsearch
+ docker:
+ client:
+ stack:
+ monitoring:
+ network:
+ monitoring:
+ driver: overlay
+ driver_opts:
+ encrypted: 1
+ service:
+ elasticsearch_client_node:
+ networks:
+ - monitoring
+ deploy:
+ replicas: 1
+ labels:
+ com.mirantis.monitoring: "elasticsearch"
+ restart_policy:
+ condition: any
+ environment:
+ ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+ cluster.name: ${_param:elasticsearch_cluster_name}
+ node.master: "false"
+ node.data: "false"
+ node.ingest: "false"
+ node.attr.client_node: "true"
+ search.remote.connect: "false"
+ network.host: 0.0.0.0
+ network.publish_host: ${_param:elasticsearch_client_node_publish_host}
+ xpack.security.enabled: "false"
+ xpack.monitoring.enabled: "false"
+ bootstrap.memory_lock: "false"
+ discovery.zen.minimum_master_nodes: 2
+ discovery.zen.ping.unicast.hosts: ${_param:stacklight_monitor_address}
+ labels:
+ com.mirantis.monitoring: "elasticsearch"
+ image: ${_param:docker_image_elasticsearch}
+ ports:
+ - 9305:9300
+ - 9205:9200
diff --git a/nginx/server/proxy/stacklight/elasticsearch.yml b/nginx/server/proxy/stacklight/elasticsearch.yml
new file mode 100644
index 0000000..82d8bad
--- /dev/null
+++ b/nginx/server/proxy/stacklight/elasticsearch.yml
@@ -0,0 +1,25 @@
+parameters:
+ nginx:
+ server:
+ stream:
+ elasticsearch_binary:
+ backend:
+ elasticsearch:
+ address: ${_param:stacklight_monitor_address}
+ port: 9305
+ host:
+ port: 9300
+ site:
+ nginx_proxy_elasticsearch:
+ enabled: true
+ type: nginx_proxy
+ name: elasticsearch
+ proxy:
+ host: ${_param:stacklight_monitor_address}
+ port: 9205
+ protocol: http
+ host:
+ name: ${_param:cluster_public_host}
+ port: 9200
+ protocol: https
+ ssl: ${_param:nginx_proxy_ssl}
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}
+
diff --git a/openssh/server/team/members/pshchelo.yaml b/openssh/server/team/members/pshchelo.yaml
new file mode 100644
index 0000000..52e7cc6
--- /dev/null
+++ b/openssh/server/team/members/pshchelo.yaml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ pshchelo:
+ enabled: true
+ name: pshchelo
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Pavlo Shchelokovskyy
+ home: /home/pshchelo
+ email: pshchelokovskyy@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ pshchelo:
+ enabled: true
+ public_keys:
+ - key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOns6c3H+TP0HBYWI+N6nX/ilPrGth5ElLCyN4EHJqcq pshchelo@git
+ user: ${linux:system:user:pshchelo}
diff --git a/salt/minion/ca/octavia_ca.yml b/salt/minion/ca/octavia_ca.yml
index 453c450..e6e0ae0 100644
--- a/salt/minion/ca/octavia_ca.yml
+++ b/salt/minion/ca/octavia_ca.yml
@@ -27,7 +27,5 @@
days_valid:
authority: ${_param:octavia_ca_days_valid_authority}
certificate: ${_param:octavia_ca_days_valid_certificate}
- ca_file: ${octavia:manager:certificates:ca_certificate}
- ca_key_file: ${octavia:manager:certificates:ca_private_key}
user: octavia
group: octavia