Permalink
Browse files

Don't specify availability zone

  • Loading branch information...
1 parent ff3bda9 commit fa3a7d1b95e4622921b74e5832307cfd76fc321b @rail rail committed Nov 7, 2012
Showing with 1 addition and 3 deletions.
  1. +1 −3 aws/aws_create_puppetmaster.py
@@ -14,7 +14,6 @@
def create_master(conn, name, options, config):
"""Creates an AMI instance with the given name and config. The config must
specify things like ami id."""
- zones = conn.get_all_zones()
# Make sure we don't request the same things twice
token = str(uuid.uuid4())[:16]
@@ -39,7 +38,6 @@ def create_master(conn, name, options, config):
subnet_id=config.get('subnet_id'),
security_group_ids=config.get('security_group_ids', []),
block_device_map=bdm,
- placement=zones[0].name,
disable_api_termination=True,
)
@@ -152,7 +150,7 @@ def puppetize(instance, name, options):
},
"us-east-1": {
"ami": "ami-10269d79", # Centos6
- "subnet_id": "subnet-28a98343",
+ "subnet_id": "subnet-33a98358",
"security_group_ids": ["sg-b36a84dc"],
"instance_type": "m1.medium",
"repo_snapshot_id": "snap-efd1ff99", # This will be mounted at /data

0 comments on commit fa3a7d1

Please sign in to comment.