Merge pull request #8 from zalando/feature/no-etcd-proxy

Don't start etcd proxy
zalando · Jun 25, 2015 · 2dd4bef · 2dd4bef
2 parents 5bf436c + 87fd47c
commit 2dd4bef
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 227 deletions.
diff --git a/docs/user-guide/deploy_spilo.md b/docs/user-guide/deploy_spilo.md
@@ -8,7 +8,7 @@ Prerequisites
 * The S3 mint bucket needs to be added to the Access Control
 
 You can use senza init to create a senza definition for the spilo appliance,
-the `ETCD_DISCOVERY_URL` should point to `HOSTED_ZONE` from the etcd-appliance that you want to use.
+the `ETCD_DISCOVERY_DOMAIN` should point to `HOSTED_ZONE` from the etcd-appliance that you want to use.
 
 	senza init DEFINITION.yaml
 

diff --git a/etcd-cluster-appliance/Dockerfile b/etcd-cluster-appliance/Dockerfile
@@ -2,7 +2,7 @@ FROM zalando/ubuntu:14.04.1-1
 
 ENV USER etcd
 ENV HOME /home/${USER}
-ENV ETCDVERSION 2.0.11
+ENV ETCDVERSION 2.0.12
 
 ## Install python
 RUN apt-get update && apt-get -y install python python-boto

diff --git a/etcd-cluster-appliance/etcd-cluster.yaml b/etcd-cluster-appliance/etcd-cluster.yaml
@@ -15,7 +15,14 @@ SenzaComponents:
       source: '{{Arguments.DockerImage}}'
       environment:
         HOSTED_ZONE: '{{Arguments.HostedZone}}'
+      mounts:
+        /home/etcd:
+          partition: none
+          filesystem: tmpfs
+          erase_on_boot: false
+          options: size=512m
       mint_bucket: '{{Arguments.MintBucket}}'
+      scalyr_account_key: '{{Arguments.ScalyrAccountKey}}'
     Type: Senza::TaupageAutoScalingGroup
     AutoScaling:
         Minimum: 3
@@ -29,6 +36,8 @@ SenzaInfo:
       Description: Docker image of etcd-cluster.
   - MintBucket:
       Description: The mint S3 bucket for OAuth 2.0 credentials
+  - ScalyrAccountKey:
+      Description: scalyr account key
   StackName: etcd-cluster
 Resources:
   EtcdRole:

diff --git a/postgres-appliance/Dockerfile b/postgres-appliance/Dockerfile
@@ -27,8 +27,8 @@ RUN apt-get install postgresql-${PGVERSION} postgresql-${PGVERSION}-dbg postgres
 # Remove the default cluster, which Debian stupidly starts right after installation of the packages
 RUN pg_dropcluster --stop ${PGVERSION} main
 
-# install psycopg2 and requests (for governor)
-RUN apt-get install python-psycopg2 -y
+# install psycopg2 and dnspython (for governor)
+RUN apt-get install python-psycopg2 python-dnspython -y
 
 # Set PGHOME as a login directory for the PostgreSQL user.
 RUN usermod -d $PGHOME -m postgres
@@ -60,7 +60,7 @@ RUN chown postgres:postgres $PGHOME -R
 RUN chown postgres:postgres /postgres_ha.sh
 RUN chmod 700 /postgres_ha.sh
 
-ENV ETCD_DISCOVERY_URL postgres.acid.example.com
+ENV ETCD_DISCOVERY_DOMAIN postgres.acid.example.com
 ENV SCOPE test
 ENV WAL_S3_BUCKET spilo-example-com
 ENV DEBUG 0

diff --git a/postgres-appliance/README b/postgres-appliance/README
@@ -12,7 +12,7 @@ This is an early stage image not meant for production yet.
 
 One can run a HA cluster with 3 nodes using senza, i.e.
 
-senza create spilo.yaml cluster_name etcd_discovery_url docker_image_path:version,
+senza create spilo.yaml cluster_name etcd_discovery_domain docker_image_path:version,
 i.e. to create a cluster called lambda:
 
 senza create spilo.yaml lambda etcd.acid.example.com yourname/spilo:0.6-SNAPSHOT

diff --git a/postgres-appliance/postgres_ha.sh b/postgres-appliance/postgres_ha.sh
@@ -22,7 +22,7 @@ restapi:
 etcd:
   scope: $SCOPE
   ttl: 30
-  host: 127.0.0.1:${etcd_client_port}
+  discovery_srv: ${ETCD_DISCOVERY_DOMAIN}
 postgresql:
   name: postgresql_${HOSTNAME}
   listen: 0.0.0.0:${pg_port}
@@ -74,20 +74,6 @@ write_postgres_yaml
 
 write_archive_command_environment
 
-function noterm
-{
-	echo "Received TERM signal, but not doing anything"
-}
-
-# resurrect etcd if it's gone
-(
-  trap noterm SIGTERM
-  while true
-  do
-    etcd -name "proxy-$SCOPE" -proxy on  --data-dir=etcd -discovery-srv $ETCD_DISCOVERY_URL
-  done
-) &
-
 # run wal-e s3 backup periodically
 (
   INITIAL=1

diff --git a/postgres-appliance/spilo.yaml b/postgres-appliance/spilo.yaml
diff --git a/postgres-appliance/test.yaml b/postgres-appliance/test.yaml
diff --git a/postgres-appliance/test.ymal b/postgres-appliance/test.ymal
diff --git a/spilo.yaml b/spilo.yaml
@@ -35,9 +35,10 @@ SenzaComponents:
         ports:
           5432: 5432
           8008: 8008
+        etcd_discovery_domain: "postgres.acid.example.com"
         environment:
           SCOPE: "{{Arguments.version}}"
-          ETCD_DISCOVERY_URL: "postgres.acid.zalan.do"
+          ETCD_DISCOVERY_DOMAIN: "postgres.acid.example.com"
           WAL_S3_BUCKET: "zalando-spilo-app"
         root: True
 Resources:
@@ -46,8 +47,8 @@ Resources:
     Properties:
       Type: CNAME
       TTL: 20
-      HostedZoneName: acid.zalan.do.
-      Name: "{{Arguments.version}}.acid.zalan.do."
+      HostedZoneName: acid.example.com.
+      Name: "{{Arguments.version}}.acid.example.com."
       ResourceRecords:
         - Fn::GetAtt:
            - PostgresLoadBalancer