Permalink
Browse files

Update us-east-1 data

  • Loading branch information...
1 parent 716ad6e commit 868c91a349fcb6f9c4ac2facc4a7c71bd944efcf @rail rail committed Dec 8, 2012
@@ -149,7 +149,7 @@ def puppetize(instance, name, options):
"centos-6-x64-base": {
"us-east-1": {
"ami": "ami-049b1e6d", # Centos6
- "subnet_id": ["subnet-33a98358", "subnet-30a9835b", "subnet-35a9835e", " subnet-0aa98361"],
+ "subnet_id": ["subnet-33a98358", "subnet-35a9835e", " subnet-0aa98361"],
"security_group_ids": ["sg-b36a84dc"],
"instance_type": "m1.large",
"repo_snapshot_id": "snap-6f9a8924", # This will be mounted at /data
@@ -1,11 +1,11 @@
{
"buildslave_password": "pass",
"buildbot_master": "10.12.48.14:9033",
- "default_puppet_server": "puppetmaster-01.srv.releng.aws-us-east-1.mozilla.com",
+ "default_puppet_server": "puppetmaster-02.srv.releng.aws-us-east-1.mozilla.com",
"home_tarball": "secrets/dev.tar.gz",
"hosts": {
- "puppet": "10.134.48.35",
- "puppetmaster-01.srv.releng.aws-us-east-1.mozilla.com": "10.134.48.35"
+ "puppet": "10.134.48.39",
+ "puppetmaster-02.srv.releng.aws-us-east-1.mozilla.com": "10.134.48.39"
},
"hg_shares": {}
}
@@ -1,11 +1,11 @@
{
"buildslave_password": "pass",
"buildbot_master": "10.12.48.14:9033",
- "default_puppet_server": "puppetmaster-01.srv.releng.aws-us-east-1.mozilla.com",
+ "default_puppet_server": "puppetmaster-02.srv.releng.aws-us-east-1.mozilla.com",
"home_tarball": "secrets/prod.tar.gz",
"hosts": {
- "puppet": "10.134.48.35",
- "puppetmaster-01.srv.releng.aws-us-east-1.mozilla.com": "10.134.48.35"
+ "puppet": "10.134.48.39",
+ "puppetmaster-02.srv.releng.aws-us-east-1.mozilla.com": "10.134.48.39"
},
"hg_shares": {
"mozilla-central": "http://ftp.mozilla.org/pub/mozilla.org/firefox/bundles/mozilla-central.hg",
@@ -1,11 +1,11 @@
{
"buildslave_password": "pass",
"buildbot_master": "10.12.48.14:9033",
- "default_puppet_server": "puppetmaster-01.srv.releng.aws-us-east-1.mozilla.com",
+ "default_puppet_server": "puppetmaster-02.srv.releng.aws-us-east-1.mozilla.com",
"home_tarball": "secrets/try.tar.gz",
"hosts": {
- "puppet": "10.134.48.35",
- "puppetmaster-01.srv.releng.aws-us-east-1.mozilla.com": "10.134.48.35"
+ "puppet": "10.134.48.39",
+ "puppetmaster-02.srv.releng.aws-us-east-1.mozilla.com": "10.134.48.39"
},
"hg_shares": {
"try": "http://ftp.mozilla.org/pub/mozilla.org/firefox/bundles/try.hg"

0 comments on commit 868c91a

Please sign in to comment.