commit 1ae92ce13119d360dfcaae9f23291b9f3ce38e73
author Volodymyr Stoiko <vstoiko@mirantis.com> Fri Aug 11 11:45:12 2017 +0300
committer Vladislav Naumov <vnaumov@mirantis.com> Wed Sep 06 12:38:39 2017 +0300
tree 75635054389eb5baf18673193ff9e4ddc95c483a
parent 9b20fc05be6f245a68da061b423cad8a8282540f

Switch to common oss overlay network

Change-Id: I60dde93b161d2be6ef0523c41254f0a761261b4c

docker/swarm/stack/pushkin.yml

diff --git a/docker/swarm/stack/pushkin.yml b/docker/swarm/stack/pushkin.yml
index 106d544..593f532 100644
--- a/docker/swarm/stack/pushkin.yml
+++ b/docker/swarm/stack/pushkin.yml
@@ -2,6 +2,10 @@
   _param:
     docker_pushkin_replicas: 1
     docker_image_pushkin: docker-prod-local.artifactory.mirantis.com/mirantis/oss/pushkin
+    pushkin_bind_host: pushkin-api
+    pushkin_bind_port: ${_param:haproxy_pushkin_bind_port}
+    pushkin_ssl:
+      enabled: false
     pushkin_db: pushkin
   docker:
     client:
@@ -11,15 +15,15 @@
             POSTGRES_USER: ${_param:pushkin_db_user}
             POSTGRES_PASSWORD: ${_param:pushkin_db_user_password}
             POSTGRES_DB: ${_param:pushkin_db}
-            PUSHKINDBHOST: ${_param:pushkin_db_host}
-            PUSHKINELASTICHOST: ${_param:haproxy_elasticsearch_bind_host}
+            PUSHKINDBHOST: ${_param:postgresql_bind_host}
+            PUSHKINELASTICHOST: ${_param:elasticsearch_bind_host}
             WEBHOOK_FROM: ${_param:webhook_from}
             WEBHOOK_RECIPIENTS: ${_param:webhook_recipients}
             WEBHOOK_LOGIN_ID: ${_param:webhook_login_id}
             WEBHOOK_APPLICATION_ID: ${_param:webhook_application_id}
             WEBHOOK_SFDC_USERNAME: ${_param:webhook_sfdc_username}
           service:
-            api:
+            pushkin-api:
               image: ${_param:docker_image_pushkin}
               deploy:
                 replicas: ${_param:docker_pushkin_replicas}
@@ -28,4 +32,8 @@
               ports:
                 - ${_param:haproxy_pushkin_exposed_port}:${_param:haproxy_pushkin_bind_port}
               volumes:
-                - /srv/volumes/pushkin/api:/var/log/pushkin
\ No newline at end of file
+                - /srv/volumes/pushkin/api:/var/log/pushkin
+          network:
+            default:
+              external:
+                name: oss_backend