commit aeec70f2b38878e27493f68b265194ce6f35d3fa
author Stanislav Riazanov <sriazanov@mirantis.com> Tue Dec 11 17:14:45 2018 +0400
committer Stanislav Riazanov <sriazanov@mirantis.com> Tue Dec 11 17:14:45 2018 +0400
tree 06f66af673db274ed94c7e73dc67c33d7b202c5f
parent 569ac8f5fe5aa6b44bf6399beab9453793fbe752

Switch maas to dockerized PostgreSQL

Changes to support deploying Postgresql in docker swarm for MAAS

Prod-related: PROD-25203 (PROD:25203)

Change-Id: Ib48de31ed35a883ea8eff5a7fb4fba46e0cd6a52

defaults/docker_images.yml

diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index b402031..a52fbc6 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -6,7 +6,6 @@
     docker_image_visualizer: "${_param:mcp_docker_registry}/mirantis/external/visualizer:${_param:mcp_version}"
     # openldap:1.1.8
     docker_image_openldap: "${_param:mcp_docker_registry}/mirantis/external/openldap:${_param:mcp_version}"
-    # library/postgres:9.6
     docker_image_postgresql: "${_param:mcp_docker_registry}/mirantis/external/library/postgres:9.6.10"
     # library/mongo:3.4 #G
     docker_image_mongodb: "${_param:mcp_docker_registry}/mirantis/external/library/mongo:${_param:mcp_version}"

docker/swarm/stack/postgresql.yml

diff --git a/docker/swarm/stack/postgresql.yml b/docker/swarm/stack/postgresql.yml
index 192b82c..b3936c6 100644
--- a/docker/swarm/stack/postgresql.yml
+++ b/docker/swarm/stack/postgresql.yml
@@ -2,7 +2,8 @@
   _param:
     docker_postgresql_replicas: 1
     postgresql_bind_host: postgresql-db
-    postgresql_bind_port: ${_param:haproxy_postgresql_bind_port}
+    postgresql_bind_port: 5432
+    postgresql_exposed_port: 5432
     postgresql_ssl:
       enabled: false
     postgresql_admin_user: postgres
@@ -14,6 +15,7 @@
           environment:
             POSTGRES_USER: ${_param:postgresql_admin_user}
             POSTGRES_PASSWORD: ${_param:postgresql_admin_user_password}
+            PGDATA: /var/lib/postgresql/data/pgdata
           service:
             postgresql-db:
               image: ${_param:docker_image_postgresql}
@@ -24,8 +26,4 @@
               volumes:
                 - /srv/volumes/postgresql/data:/var/lib/postgresql/data
               ports:
-                - ${_param:haproxy_postgresql_exposed_port}:${_param:haproxy_postgresql_bind_port}
-          network:
-            default:
-              external:
-                name: oss_backend
+                - ${_param:postgresql_exposed_port}:${_param:postgresql_bind_port}