Fix Pushkin Notification service metadata
Change-Id: I7312b108f671fd2dff2b3b8fde30ff703fe676bc
diff --git a/devops_portal/service/pushkin.yml b/devops_portal/service/pushkin.yml
new file mode 100644
index 0000000..82a073c
--- /dev/null
+++ b/devops_portal/service/pushkin.yml
@@ -0,0 +1,10 @@
+parameters:
+ devops_portal:
+ config:
+ service:
+ pushkin:
+ configure_proxy: true
+ endpoint:
+ address: ${_param:haproxy_pushkin_bind_host}
+ port: ${_param:haproxy_pushkin_bind_port}
+ https: ${_param:haproxy_pushkin_ssl:enabled}
diff --git a/docker/swarm/service/elasticsearch.yml b/docker/swarm/service/elasticsearch.yml
index 02dea57..4d49494 100644
--- a/docker/swarm/service/elasticsearch.yml
+++ b/docker/swarm/service/elasticsearch.yml
@@ -16,4 +16,4 @@
elasticsearch:
type: bind
source: /srv/volumes/elasticsearch
- destination: /var/lib/elasticsearch/data
+ destination: /usr/share/elasticsearch/data
diff --git a/docker/swarm/service/pushkin.yml b/docker/swarm/service/pushkin.yml
index e4fe424..d01842d 100644
--- a/docker/swarm/service/pushkin.yml
+++ b/docker/swarm/service/pushkin.yml
@@ -25,4 +25,4 @@
pushkin:
type: bind
source: /srv/volumes/pushkin/logs
- destination: /var/log/pushkin/logs
\ No newline at end of file
+ destination: /var/log/pushkin
\ No newline at end of file
diff --git a/glusterfs/client/volume/pushkin.yml b/glusterfs/client/volume/pushkin.yml
index 1853863..6191cb4 100644
--- a/glusterfs/client/volume/pushkin.yml
+++ b/glusterfs/client/volume/pushkin.yml
@@ -7,4 +7,4 @@
pushkin:
path: /srv/volumes/pushkin
server: ${_param:pushkin_glusterfs_service_host}
- opts: 'defaults'
+ opts: 'defaults'
\ No newline at end of file
diff --git a/haproxy/proxy/listen/oss/pushkin.yml b/haproxy/proxy/listen/oss/pushkin.yml
index 458a226..db33352 100644
--- a/haproxy/proxy/listen/oss/pushkin.yml
+++ b/haproxy/proxy/listen/oss/pushkin.yml
@@ -11,13 +11,13 @@
pushkin:
mode: http
options:
- - httpchk get /apps
+ - httpchk GET /apps
balance: source
http_request:
- action: "add-header X-Forwarded-Proto https"
condition: "if { ssl_fc }"
sticks:
- - http-check expect ! rstatus ^5
+ - http-check expect status 200
binds:
- address: ${_param:haproxy_pushkin_bind_host}
port: ${_param:haproxy_pushkin_bind_port}
diff --git a/haproxy/proxy/listen/oss/pushkin_db.yml b/haproxy/proxy/listen/oss/pushkin_db.yml
index 74b15a2..c67c591 100644
--- a/haproxy/proxy/listen/oss/pushkin_db.yml
+++ b/haproxy/proxy/listen/oss/pushkin_db.yml
@@ -12,7 +12,7 @@
mode: tcp
balance: source
options:
- - pgsql-check user ${_param:pushkin_db_user}
+ - tcp-check
binds:
- address: ${_param:haproxy_pushkin_db_bind_host}
port: ${_param:haproxy_pushkin_db_bind_port}
@@ -21,12 +21,12 @@
- name: ${_param:cluster_node01_name}
host: ${_param:cluster_node01_address}
port: ${_param:haproxy_pushkin_db_exposed_port}
- params: check
+ params: check port ${_param:haproxy_pushkin_db_exposed_port}
- name: ${_param:cluster_node02_name}
host: ${_param:cluster_node02_address}
port: ${_param:haproxy_pushkin_db_exposed_port}
- params: backup check
+ params: backup check port ${_param:haproxy_pushkin_db_exposed_port}
- name: ${_param:cluster_node03_name}
host: ${_param:cluster_node03_address}
port: ${_param:haproxy_pushkin_db_exposed_port}
- params: backup check
+ params: backup check port ${_param:haproxy_pushkin_db_exposed_port}