need bastion sub domains to bootstrap through gateway

formatron · Nov 18, 2015 · 3fe998c · 3fe998c
1 parent 8d08b3a
commit 3fe998c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/formatron/external/dsl.rb b/lib/formatron/external/dsl.rb
@@ -57,6 +57,7 @@ def self.merge(formatron:, configuration:)
                 new_bastions.each do |bastion_key, new_bastion|
                   subnet.bastion bastion_key do |bastion|
                     bastion.guid new_bastion['guid']
+                    bastion.sub_domain new_bastion['sub_domain']
                   end
                 end
                 new_chef_servers = new_subnet['chef_servers']
@@ -141,7 +142,8 @@ def self.export(formatron:)
             end
             bastions.each do |bastion_key, bastion|
               subnet_configuration['bastions'][bastion_key] = {
-                'guid' => bastion.guid
+                'guid' => bastion.guid,
+                'sub_domain' => bastion.sub_domain
               }
             end
             chef_servers.each do |chef_server_key, chef_server|

diff --git a/spec/formatron/external/dsl_spec.rb b/spec/formatron/external/dsl_spec.rb
@@ -37,10 +37,12 @@ class External
                     },
                     'bastions' => {
                       'bastion1' => {
-                        'guid' => 'bastion1_guid'
+                        'guid' => 'bastion1_guid',
+                        'sub_domain' => 'bastion1_sub_domain'
                       },
                       'bastion2' => {
-                        'guid' => 'bastion2_guid'
+                        'guid' => 'bastion2_guid',
+                        'sub_domain' => 'bastion2_sub_domain'
                       }
                     },
                     'chef_servers' => {