Separate postgresql for devops portal services
Change-Id: Ia41f73c48d392bbdf9b3207e9936b4aebb99eb1a
diff --git a/docker/swarm/stack/elasticsearch.yml b/docker/swarm/stack/elasticsearch.yml
new file mode 100644
index 0000000..083388c
--- /dev/null
+++ b/docker/swarm/stack/elasticsearch.yml
@@ -0,0 +1,19 @@
+parameters:
+ _param:
+ elasticsearch_replicas: 1
+ docker_image_oss_elasticsearch: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/elasticsearch:latest
+ docker:
+ client:
+ stack:
+ elasticsearch:
+ service:
+ cluster:
+ image: ${_param:docker_image_oss_elasticsearch}
+ deploy:
+ replicas: ${_param:elasticsearch_replicas}
+ restart_policy:
+ condition: any
+ ports:
+ - ${_param:haproxy_elasticsearch_exposed_port}:${_param:haproxy_elasticsearch_bind_port}
+ volumes:
+ - /srv/volumes/elasticsearch:/usr/share/elasticsearch/data
diff --git a/docker/swarm/stack/postgresql.yml b/docker/swarm/stack/postgresql.yml
new file mode 100644
index 0000000..bdad6fb
--- /dev/null
+++ b/docker/swarm/stack/postgresql.yml
@@ -0,0 +1,24 @@
+parameters:
+ _param:
+ docker_postgresql_replicas: 1
+ docker_image_postgresql: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/postgresql:latest
+ postgresql_admin_user: postgres
+ postgresql_admin_user_password: postgrespassword
+ docker:
+ client:
+ stack:
+ postgresql:
+ environment:
+ POSTGRES_USER: ${_param:postgresql_admin_user}
+ POSTGRES_PASSWORD: ${_param:postgresql_admin_user_password}
+ service:
+ db:
+ image: ${_param:docker_image_postgresql}
+ deploy:
+ replicas: ${_param:docker_postgresql_replicas}
+ restart_policy:
+ condition: any
+ ports:
+ - ${_param:haproxy_postgresql_exposed_port}:${_param:haproxy_postgresql_bind_port}
+ volumes:
+ - /srv/volumes/postgresql/data:/var/lib/postgresql/data
diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index b28b1e9..3232301 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -1,36 +1,20 @@
parameters:
_param:
- docker_pushkin_db_replicas: 1
- docker_image_pushkin_db: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/pushkindb:latest
- pushkin_db_password: pushkin
- pushkin_db_user: pushkin
- pushkin_db: pushkin
docker_pushkin_replicas: 1
docker_image_pushkin: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/pushkin:latest
- elasticsearch_replicas: 1
- docker_image_oss_elasticsearch: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/elasticsearch:latest
+ pushkin_db: pushkin
docker:
client:
stack:
pushkin:
environment:
POSTGRES_USER: ${_param:pushkin_db_user}
- POSTGRES_PASSWORD: ${_param:pushkin_db_password}
+ POSTGRES_PASSWORD: ${_param:pushkin_db_user_password}
POSTGRES_DB: ${_param:pushkin_db}
- PUSHKINDBHOST: ${_param:haproxy_pushkin_db_bind_host}
+ PUSHKINDBHOST: ${_param:pushkin_db_host}
PUSHKINELASTICHOST: ${_param:haproxy_elasticsearch_bind_host}
service:
- db:
- image: ${_param:docker_image_pushkin_db}
- deploy:
- replicas: ${_param:docker_pushkin_db_replicas}
- restart_policy:
- condition: any
- ports:
- - ${_param:haproxy_pushkin_db_exposed_port}:${_param:haproxy_pushkin_db_bind_port}
- volumes:
- - /srv/volumes/pushkin/data:/var/lib/postgresql/data
- backend:
+ api:
image: ${_param:docker_image_pushkin}
deploy:
replicas: ${_param:docker_pushkin_replicas}
@@ -39,14 +23,4 @@
ports:
- ${_param:haproxy_pushkin_exposed_port}:${_param:haproxy_pushkin_bind_port}
volumes:
- - /srv/volumes/pushkin/logs:/var/log/pushkin
- elasticsearch:
- image: ${_param:docker_image_oss_elasticsearch}
- deploy:
- replicas: ${_param:elasticsearch_replicas}
- restart_policy:
- condition: any
- ports:
- - ${_param:haproxy_elasticsearch_exposed_port}:${_param:haproxy_elasticsearch_bind_port}
- volumes:
- - /srv/volumes/elasticsearch:/usr/share/elasticsearch/data
+ - /srv/volumes/pushkin/api:/var/log/pushkin
\ No newline at end of file
diff --git a/haproxy/proxy/listen/oss/postgresql.yml b/haproxy/proxy/listen/oss/postgresql.yml
new file mode 100644
index 0000000..1bc1f44
--- /dev/null
+++ b/haproxy/proxy/listen/oss/postgresql.yml
@@ -0,0 +1,32 @@
+parameters:
+ _param:
+ haproxy_postgresql_bind_host: ${_param:haproxy_bind_address}
+ haproxy_postgresql_bind_port: 5432
+ haproxy_postgresql_exposed_port: 15432
+ haproxy_postgresql_ssl:
+ enabled: false
+ haproxy:
+ proxy:
+ listen:
+ postgresql:
+ mode: tcp
+ balance: source
+ options:
+ - tcp-check
+ binds:
+ - address: ${_param:haproxy_postgresql_bind_host}
+ port: ${_param:haproxy_postgresql_bind_port}
+ ssl: ${_param:haproxy_postgresql_ssl}
+ servers:
+ - name: ${_param:cluster_node01_name}
+ host: ${_param:cluster_node01_address}
+ port: ${_param:haproxy_postgresql_exposed_port}
+ params: check port ${_param:haproxy_postgresql_exposed_port}
+ - name: ${_param:cluster_node02_name}
+ host: ${_param:cluster_node02_address}
+ port: ${_param:haproxy_postgresql_exposed_port}
+ params: backup check port ${_param:haproxy_postgresql_exposed_port}
+ - name: ${_param:cluster_node03_name}
+ host: ${_param:cluster_node03_address}
+ port: ${_param:haproxy_postgresql_exposed_port}
+ params: backup check port ${_param:haproxy_postgresql_exposed_port}
diff --git a/haproxy/proxy/listen/oss/pushkin_db.yml b/haproxy/proxy/listen/oss/pushkin_db.yml
deleted file mode 100644
index c67c591..0000000
--- a/haproxy/proxy/listen/oss/pushkin_db.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-parameters:
- _param:
- haproxy_pushkin_db_bind_host: ${_param:haproxy_bind_address}
- haproxy_pushkin_db_bind_port: 5432
- haproxy_pushkin_db_exposed_port: 15432
- haproxy_pushkin_db_ssl:
- enabled: false
- haproxy:
- proxy:
- listen:
- pushkin_db:
- mode: tcp
- balance: source
- options:
- - tcp-check
- binds:
- - address: ${_param:haproxy_pushkin_db_bind_host}
- port: ${_param:haproxy_pushkin_db_bind_port}
- ssl: ${_param:haproxy_pushkin_db_ssl}
- servers:
- - name: ${_param:cluster_node01_name}
- host: ${_param:cluster_node01_address}
- port: ${_param:haproxy_pushkin_db_exposed_port}
- 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 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 port ${_param:haproxy_pushkin_db_exposed_port}
diff --git a/postgresql/client/pushkin.yml b/postgresql/client/pushkin.yml
new file mode 100644
index 0000000..12b5906
--- /dev/null
+++ b/postgresql/client/pushkin.yml
@@ -0,0 +1,27 @@
+parameters:
+ _param:
+ pushkin_db_host: ${_param:haproxy_postgresql_bind_host}
+ pushkin_db_port: ${_param:haproxy_postgresql_bind_port}
+ pushkin_db_user: pushkin
+ pushkin_db_user_password: pushkin
+ postgresql:
+ client:
+ server:
+ server01:
+ admin:
+ host: ${_param:pushkin_db_host}
+ port: ${_param:pushkin_db_port}
+ user: ${_param:postgresql_admin_user}
+ password: ${_param:postgresql_admin_user_password}
+ database:
+ pushkin:
+ enabled: true
+ encoding: 'UTF8'
+ locale: 'en_US'
+ template: 'hstore_enabled'
+ users:
+ - name: ${_param:pushkin_db_user}
+ password: ${_param:pushkin_db_user_password}
+ host: ${_param:pushkin_db_host}
+ createdb: true
+ rights: all privileges