Make DNS more optional, add iNternal zone

cloudtools · May 7, 2015 · ee4ecc3 · ee4ecc3
1 parent 0e146c7
commit ee4ecc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/stacker/blueprints/vpc.py b/stacker/blueprints/vpc.py
@@ -43,7 +43,12 @@ class VPC(Blueprint):
             "type": "AWS::EC2::KeyPair::KeyName"},
         "BaseDomain": {
             "type": "String",
+            "default": "",
             "description": "Base domain for the stack."},
+        "InternalDomain": {
+            "type": "String",
+            "default": "",
+            "description": "Internal domain name, if you have one."},
         "CidrBlock": {
             "type": "String",
             "description": "Base CIDR block for subnets.",
@@ -77,9 +82,10 @@ def create_default_security_group(self):
 
     def create_dhcp_options(self):
         t = self.template
+        domain_name = Join(" ", [Ref("BaseDomain"), Ref("InternalDomain")])
         dhcp_options = t.add_resource(ec2.DHCPOptions(
             'DHCPOptions',
-            DomainName=Ref("BaseDomain"),
+            DomainName=domain_name,
             DomainNameServers=['AmazonProvidedDNS', ]))
         t.add_resource(ec2.VPCDHCPOptionsAssociation(
             'DHCPAssociation',

diff --git a/stacker/builder.py b/stacker/builder.py
@@ -320,7 +320,6 @@ def sync_plan_status(self):
             if not local_status == STATUS_SUBMITTED:
                 logger.debug("Stack %s not submitted yet.", stack_name)
                 continue
-            logger.debug("Getting '%s' stack state from AWS.", stack_name)
             cf_status = self.get_stack_status(full_name)
             logger.debug("Stack %s cloudformation status: %s", full_name,
                          cf_status)