Merge branch 'feature/no-etcd-proxy' of github.com:zalando/spilo

zalando · Jul 7, 2015 · 326a02d · 326a02d
2 parents 2dd4bef + 1b61c60
commit 326a02d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
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.12
+ENV ETCDVERSION 2.0.13
 
 ## 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
@@ -6,7 +6,9 @@ SenzaComponents:
     - Ref: EtcdRole
     InstanceType: t2.micro
     SecurityGroups:
-    - app-etcd-cluster
+    - Fn::GetAtt:
+      - EtcdSecurityGroup
+      - GroupId
     TaupageConfig:
       ports:
         2379: 2379
@@ -25,9 +27,9 @@ SenzaComponents:
       scalyr_account_key: '{{Arguments.ScalyrAccountKey}}'
     Type: Senza::TaupageAutoScalingGroup
     AutoScaling:
-        Minimum: 3
-        Maximum: 3
-        MetricType: CPU
+      Minimum: 3
+      Maximum: 3
+      MetricType: CPU
 SenzaInfo:
   Parameters:
   - HostedZone:
@@ -40,6 +42,19 @@ SenzaInfo:
       Description: scalyr account key
   StackName: etcd-cluster
 Resources:
+  EtcdSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Etcd Appliance Security Group
+      SecurityGroupIngress:
+      - IpProtocol: tcp
+        FromPort: 22
+        ToPort: 22
+        CidrIp: 0.0.0.0/0
+      - IpProtocol: tcp
+        FromPort: 2379
+        ToPort: 2380
+        CidrIp: 0.0.0.0/0
   EtcdRole:
     Type: AWS::IAM::Role
     Properties: