Merge pull request #276 from MihaiTabara/regions

Bugs 1317800, 1317747 - Add beetmover/balrog workers configs in us we…
mozilla-releng · Jan 9, 2017 · 0429cbe · 0429cbe
2 parents 7d217a7 + afa2f3d
commit 0429cbe
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 0 deletions.
diff --git a/configs/balrogworker b/configs/balrogworker
@@ -20,5 +20,28 @@
         "tags": {
             "moz-type": "balrogworker"
         }
+    },
+
+    "us-west-2": {
+        "type": "balrogworker",
+        "domain": "srv.releng.usw2.mozilla.com",
+        "ami": "ami-eb89acdb",
+        "subnet_ids": ["subnet-d50cb6a2"],
+        "security_group_ids": ["sg-3291414a"],
+        "instance_type": "t2.micro",
+        "distro": "centos",
+        "ssh_key": "aws-releng",
+        "use_public_ip": true,
+        "device_map": {
+            "/dev/xvda": {
+                "delete_on_termination": true,
+                "skip_resize": true,
+                "volume_type": "gp2",
+                "instance_dev": "/dev/xvda1"
+            }
+        },
+        "tags": {
+            "moz-type": "balrogworker"
+        }
     }
 }
diff --git a/configs/beetmoverworker b/configs/beetmoverworker
@@ -20,5 +20,28 @@
         "tags": {
             "moz-type": "beetmoverworker"
         }
+    },
+
+    "us-west-2": {
+        "type": "beetmoverworker",
+        "domain": "srv.releng.usw2.mozilla.com",
+        "ami": "ami-eb89acdb",
+        "subnet_ids": ["subnet-d50cb6a2"],
+        "security_group_ids": ["sg-6497471c"],
+        "instance_type": "t2.micro",
+        "distro": "centos",
+        "ssh_key": "aws-releng",
+        "use_public_ip": true,
+        "device_map": {
+            "/dev/xvda": {
+                "delete_on_termination": true,
+                "skip_resize": true,
+                "volume_type": "gp2",
+                "instance_dev": "/dev/xvda1"
+            }
+        },
+        "tags": {
+            "moz-type": "beetmoverworker"
+        }
     }
 }
diff --git a/configs/securitygroups.yml b/configs/securitygroups.yml
@@ -565,6 +565,7 @@ balrogworker:
     description: security group for balrogworkers
     regions:
         us-east-1: vpc-b42100df
+        us-west-2: vpc-cd63f2a4
     inbound:
         - proto: tcp
           ports:
@@ -584,6 +585,7 @@ beetmoverworker:
     description: security group for beetmoverworkers
     regions:
         us-east-1: vpc-b42100df
+        us-west-2: vpc-cd63f2a4
     inbound:
         - proto: tcp
           ports: