Merge pull request #39 from remind101/fix_internal_zone_check

Fix internal zone detection
cloudtools · Jul 14, 2015 · 9a73068 · 9a73068
2 parents 58c68be + c7b6d42
commit 9a73068
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 tests_require = [
     'nose>=1.0',
-    'mock>=1.0',
+    'mock==1.0.1',
 ]
 
 

diff --git a/stacker/blueprints/vpc.py b/stacker/blueprints/vpc.py
@@ -4,7 +4,8 @@
 """
 
 from troposphere import (
-    Ref, Output, Join, FindInMap, Select, GetAZs, Not, Equals, Tags, And, Or
+    Ref, Output, Join, FindInMap, Select, GetAZs, Not, Equals, Tags, Or,
+    Condition
 )
 from troposphere import ec2
 from troposphere.route53 import HostedZone, HostedZoneVPCs
@@ -65,17 +66,20 @@ class VPC(Blueprint):
 
     def create_conditions(self):
         self.template.add_condition(
-            "NoHostedZones",
-            And(
-                Equals(Ref("InternalDomain"), ""),
-                Equals(Ref("BaseDomain"), ""),
-            ))
+            "HasInternalDomain",
+            Not(Equals(Ref("InternalDomain"), "")))
+        self.template.add_condition(
+            "HasExternalDomain",
+            Not(Equals(Ref("BaseDomain"), "")))
         self.template.add_condition(
             "HasHostedZones",
             Or(
-                Not(Equals(Ref("InternalDomain"), "")),
-                Not(Equals(Ref("BaseDomain"), "")),
+                Condition("HasInternalDomain"),
+                Condition("HasExternalDomain")
             ))
+        self.template.add_condition(
+            "NoHostedZones",
+            Not(Condition("HasHostedZones")))
 
     def create_vpc(self):
         t = self.template
@@ -96,17 +100,17 @@ def create_internal_zone(self):
                 VPCs=[HostedZoneVPCs(
                     VPCId=VPC_ID,
                     VPCRegion=Ref("AWS::Region"))],
-                Condition="HasHostedZones"))
+                Condition="HasInternalDomain"))
         t.add_output(
             Output(
                 "InternalZoneId",
                 Value=Ref("InternalZone"),
-                Condition="HasHostedZones"))
+                Condition="HasInternalDomain"))
         t.add_output(
             Output(
                 "InternalZoneName",
                 Value=Ref("InternalDomain"),
-                Condition="HasHostedZones"))
+                Condition="HasInternalDomain"))
 
     def create_default_security_group(self):
         t = self.template