Remove unnecessary prerequisites, use newer senza syntax.

The etcd-appliance is now available on os-registry.stups.zalan.do, therefore some prerequisites are not required
anymore. Senza syntax has also been enriched, providing named parameters increasing readability.

docs/user-guide/deploy_etcd.md

@@ -6,13 +6,10 @@ The following prerequisites need to be met.
 * `stups-senza`
 * A [Senza Definition](http://stups.readthedocs.org/en/latest/components/senza.html#senza-definition)
 * A template can be found here: [etcd-appliance.yaml](https://github.com/zalando/spilo/blob/master/etcd-cluster-appliance/etcd-cluster.yaml)
-* The Security Group defined in the Senza Definition needs to be created
-* The appliction\_id `etcd-cluster` needs to be registered in yourturn
-* The S3 mint bucket needs to be added to the Access Control
 
 To deploy the etcd-appliance, use the following:
 
-	senza create DEFINITION.yaml VERSION HOSTED_ZONE DOCKER_IMAGE MINT_BUCKET
+	senza create DEFINITION.yaml VERSION HostedZone=<HOSTED_ZONE> DockerImage=<DOCKER_IMAGE> ScalyrAccountKey=<SCALAR_KEY>
 
 This will create and execute a cloud formation template for you.
 
@@ -23,8 +20,17 @@ Argument   		   | Value
 Definition         | etcd-appliance.yaml
 Hosted zone 	   | team.example.com
 Version 		   | release
-Docker repository  | docker.registry.example.com
-Docker image       | repository/etcd-appliance
-Image tag          | 0.2-SNAPSHOT
+Docker repository  | os-registry.stups.zalan.do
+DockerImage       | acid/etcd-cluster
+Image tag          | 2.0.13-p1
+Scalyr Key         | mykey
 
-	senza create etcd-cluster.yaml release team.example.com docker.registry.example.com/repository/etcd-appliance:0.2-SNAPSHOT bytes-other-12345690-us-west-1
+	senza create etcd-cluster.yaml release HostedZone=team.example.com DockerImage=os-registry.stups.zalan.do/acid/etcd-cluster:2.0.13-p1 ScalyrAccountKey=mykey
+
+The etcd appliance will create 2 dns-records within the specified HostedZone, they will reflect changes within
+the cluster:
+
+- `_etcd-server._tcp.<Version>.<HostedZone>`  a `SRV` record for discovery purposes
+- `etcd-server.<Version>.<HostedZone>`: an `A` record 
+
+If you want your own specific dns-record to point to etcd, create a `CNAME` which points to the `A` record.

etcd-cluster-appliance/etcd-cluster.yaml

@@ -10,7 +10,6 @@ SenzaComponents:
       - EtcdSecurityGroup
       - GroupId
     TaupageConfig:
-      application_id: "{{Arguments.ApplicationId}}"
       ports:
         2379: 2379
         2380: 2380
@@ -24,7 +23,6 @@ SenzaComponents:
           filesystem: tmpfs
           erase_on_boot: false
           options: size=512m
-      mint_bucket: '{{Arguments.MintBucket}}'
       scalyr_account_key: '{{Arguments.ScalyrAccountKey}}'
     Type: Senza::TaupageAutoScalingGroup
     AutoScaling:
@@ -33,14 +31,10 @@ SenzaComponents:
       MetricType: CPU
 SenzaInfo:
   Parameters:
-  - ApplicationId:
-      Description: Name of your etcd application from Kio/Yourturn
   - HostedZone:
       Description: AWS Hosted Zone to work with
   - DockerImage:
       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
@@ -80,9 +74,6 @@ Resources:
           - Effect: Allow
             Action: autoscaling:Describe*
             Resource: "*"
-          - Effect: Allow
-            Action: "s3:GetObject"
-            Resource: ["arn:aws:s3:::{{Arguments.MintBucket}}/*"]
       - PolicyName: AmazonRoute53Access
         PolicyDocument:
           Version: "2012-10-17"