Merge branch 'master' of github.com:zalando/spilo

postgres-appliance/Dockerfile

@@ -45,8 +45,9 @@ ADD postgres_ha.sh /home/postgres/
 RUN chown postgres:postgres /home/postgres/postgres_ha.sh
 RUN chmod 700 /home/postgres/postgres_ha.sh
 
-ENV ETCD_CLUSTER "default=http://127.0.0.1:7001"
-ENV SCOPE "batman"
+ENV ETCD_ADDRESS=""
+ENV ETCD_DISCOVERY_URL postgres.acid.zalan.do
+ENV SCOPE test
 ENV DEBUG 0
 # run subsequent commands as user postgres
 USER postgres

postgres-appliance/postgres_ha.sh

@@ -18,7 +18,7 @@ postgresql:
   replication:
     username: standby
     password: standby
-    network: samenet
+    network: 0.0.0.0/0
   parameters:
     archive_mode: "on"
     wal_level: hot_standby
@@ -38,11 +38,15 @@ write_postgres_yaml
 
 # start etcd proxy
 # for the -proxy on TDB the url of the etcd cluster
-if [ "$DEBUG" -eq 1 ]
+[ "$DEBUG" -eq 1 ] && exec /bin/bash
+
+if [[ -n $ETCD_ADDRESS ]]
 then
-  exec /bin/bash
+  # address is still useful for local debugging
+  etcd -name "proxy-$SCOPE" -proxy on -bind-addr 127.0.0.1:8080 --data-dir=etcd -initial-cluster $ETCD_ADDRESS &
+else
+  etcd -name "proxy-$SCOPE" -proxy on -bind-addr 127.0.0.1:8080 --data-dir=etcd -discovery-srv $ETCD_DISCOVERY_URL &
 fi
-etcd -name "proxy-$SCOPE" -proxy on -bind-addr 127.0.0.1:8080 --data-dir=etcd -initial-cluster $ETCD_CLUSTER &
 
 exec governor/governor.py "/home/postgres/postgres.yml"