Update CloudFormation configs with latest stable CoreOS releases.

debrouwere · Sep 28, 2015 · 1d4b373 · 1d4b373
1 parent c6fbb91
commit 1d4b373
Show file tree

Hide file tree

Showing 6 changed files with 280 additions and 278 deletions.
diff --git a/pollster/utils/fleet.py b/pollster/utils/fleet.py
@@ -11,7 +11,8 @@ def connect():
         fleet = sh.fleetctl.bake(
             tunnel=os.environ['FLEETCTL_TUNNEL_IPV4'])
     else:
-        endpoint = "http://{localhost}:4001/".format(
+        endpoint = "http://{localhost}:{port}/".format(
+            port=os.environ.get('ETCD_PORT', '4001'),
             localhost=os.environ['COREOS_PRIVATE_IPV4'])
         fleet = sh.fleetctl.bake(endpoint=endpoint)
 

diff --git a/stack/cloudformation/coreos-stable-hvm.template b/stack/cloudformation/coreos-stable-hvm.template
@@ -5,43 +5,43 @@
       "RegionMap" : {
 
           "eu-central-1" : {
-              "AMI" : "ami-02211b1f"
+              "AMI" : "ami-74bbba69"
           },
 
           "ap-northeast-1" : {
-              "AMI" : "ami-22d27b22"
+              "AMI" : "ami-1e77ff1e"
           },
 
           "us-gov-west-1" : {
-              "AMI" : "ami-e53a59c6"
+              "AMI" : "ami-f1d1b2d2"
           },
 
           "sa-east-1" : {
-              "AMI" : "ami-45a62a58"
+              "AMI" : "ami-632ba17e"
           },
 
           "ap-southeast-2" : {
-              "AMI" : "ami-2b2e6911"
+              "AMI" : "ami-83f8b4b9"
           },
 
           "ap-southeast-1" : {
-              "AMI" : "ami-0ef1f15c"
+              "AMI" : "ami-12060c40"
           },
 
           "us-east-1" : {
-              "AMI" : "ami-6b1cd400"
+              "AMI" : "ami-f396fa96"
           },
 
           "us-west-2" : {
-              "AMI" : "ami-f5a5a5c5"
+              "AMI" : "ami-99bfada9"
           },
 
           "us-west-1" : {
-              "AMI" : "ami-bf8477fb"
+              "AMI" : "ami-dbe71d9f"
           },
 
           "eu-west-1" : {
-              "AMI" : "ami-50f4b927"
+              "AMI" : "ami-83e9c8f4"
           }
 
       }

diff --git a/stack/cloudformation/data.json b/stack/cloudformation/data.json
@@ -3,27 +3,27 @@
     "DynamoDBTable": {
       "Type": "AWS::DynamoDB::Table",
       "Properties": {
-        "KeySchema": [
+        "AttributeDefinitions": [
           {
-            "KeyType": "HASH",
-            "AttributeName": "url"
+            "AttributeName": "url",
+            "AttributeType": "S"
           },
           {
-            "KeyType": "RANGE",
-            "AttributeName": "timestamp"
+            "AttributeName": "timestamp",
+            "AttributeType": "N"
           }
         ],
-        "TableName": "social-shares",
-        "AttributeDefinitions": [
+        "KeySchema": [
           {
-            "AttributeType": "S",
-            "AttributeName": "url"
+            "AttributeName": "url",
+            "KeyType": "HASH"
           },
           {
-            "AttributeType": "N",
-            "AttributeName": "timestamp"
+            "AttributeName": "timestamp",
+            "KeyType": "RANGE"
           }
         ],
+        "TableName": "social-shares",
         "ProvisionedThroughput": {
           "ReadCapacityUnits": 10,
           "WriteCapacityUnits": 10
@@ -40,35 +40,35 @@
   "AWSTemplateFormatVersion": "2010-09-09",
   "Mappings": {
     "RegionMap": {
-      "us-west-1": {
-        "AMI": "ami-bf8477fb"
+      "ap-southeast-1": {
+        "AMI": "ami-12060c40"
       },
-      "eu-central-1": {
-        "AMI": "ami-02211b1f"
+      "us-east-1": {
+        "AMI": "ami-f396fa96"
       },
-      "ap-southeast-2": {
-        "AMI": "ami-2b2e6911"
+      "us-west-2": {
+        "AMI": "ami-99bfada9"
       },
-      "eu-west-1": {
-        "AMI": "ami-50f4b927"
+      "sa-east-1": {
+        "AMI": "ami-632ba17e"
       },
       "us-gov-west-1": {
-        "AMI": "ami-e53a59c6"
+        "AMI": "ami-f1d1b2d2"
       },
-      "ap-southeast-1": {
-        "AMI": "ami-0ef1f15c"
+      "us-west-1": {
+        "AMI": "ami-dbe71d9f"
       },
       "ap-northeast-1": {
-        "AMI": "ami-22d27b22"
+        "AMI": "ami-1e77ff1e"
       },
-      "us-east-1": {
-        "AMI": "ami-6b1cd400"
+      "eu-central-1": {
+        "AMI": "ami-74bbba69"
       },
-      "sa-east-1": {
-        "AMI": "ami-45a62a58"
+      "ap-southeast-2": {
+        "AMI": "ami-83f8b4b9"
       },
-      "us-west-2": {
-        "AMI": "ami-f5a5a5c5"
+      "eu-west-1": {
+        "AMI": "ami-83e9c8f4"
       }
     }
   },