Merge pull request #3 from eGT-Labs/subnet_pref_localvpc

BEES
cloudamatic · Apr 17, 2015 · 6902543 · 6902543
2 parents 36278e8 + 6e13710
commit 6902543
Show file tree

Hide file tree

Showing 9 changed files with 216 additions and 138 deletions.
diff --git a/demo/tiered_apps/bastion.yaml b/demo/tiered_apps/bastion.yaml
@@ -6,7 +6,6 @@
       assign_ip: true
     vpc:
       vpc_name: vpc
-      subnet_name: TieredSubnet<%= Random.rand($azs.size-1).floor %>Public
     ingress_rules:
     - proto: icmp
       hosts:

diff --git a/demo/tiered_apps/database.yaml b/demo/tiered_apps/database.yaml
@@ -1,14 +1,10 @@
   - name: drupaldb
     engine: mysql
     vpc:
-<% if !$vpc_deploy_id then %>
-      vpc_name: vpc
-      subnets:
-        <% (0..$azs.size-1).each do |i| %>
-      - subnet_name: TieredSubnet<%= i %>Private
-        <% end %>
-<% else %>
+<% if $vpc_deploy_id then %>
       deploy_id: <%= $vpc_deploy_id %>
+<% else %>
+      vpc_name: vpc
 <% end %>
 <% if $environment == 'dev' then %>
     size: db.t2.medium

diff --git a/demo/tiered_apps/lnxapps_lb.yaml b/demo/tiered_apps/lnxapps_lb.yaml
@@ -2,11 +2,8 @@
     private: true
     vpc:
     <% if !$vpc_deploy_id then %>
+      subnet_pref: all_private
       vpc_name: vpc
-      subnets:
-        <% (1..$azs.size).each do |i| %>
-      - subnet_name: TieredSubnet<%= i-1 %>Private
-        <% end %>
     <% else %>
       deploy_id: <%= $vpc_deploy_id %>
       subnet_pref: all_private

diff --git a/demo/tiered_apps/lnxapps_pool.yaml b/demo/tiered_apps/lnxapps_pool.yaml
@@ -22,13 +22,9 @@
       name: drupaldb
     vpc:
     <% if !$vpc_deploy_id then %>
-      vpc_name: vpc
       nat_host_name: bastion
       nat_ssh_user: root
-      subnets:
-        <% (1..$azs.size).each do |i| %>
-      - subnet_name: TieredSubnet<%= i-1 %>Private
-        <% end %>
+      vpc_name: vpc
     <% else %>
       deploy_id: <%= $vpc_deploy_id %>
     <% end %>

diff --git a/demo/tiered_apps/proxy_lb.yaml b/demo/tiered_apps/proxy_lb.yaml
@@ -1,13 +1,9 @@
   - name: proxylb
     vpc:
-    <% if !$vpc_deploy_id then %>
-      vpc_name: vpc
-      subnets:
-        <% (1..$azs.size).each do |i| %>
-      - subnet_name: TieredSubnet<%= i-1 %>Public
-        <% end %>
-    <% else %>
+    <% if $vpc_deploy_id then %>
       deploy_id: <%= $vpc_deploy_id %>
+    <% else %>
+      vpc_name: vpc
     <% end %>
     cross_zone_unstickiness: true
     add_firewall_rules:

diff --git a/demo/tiered_apps/proxy_pool.yaml b/demo/tiered_apps/proxy_pool.yaml
@@ -16,13 +16,9 @@
       my_domain: "<%= $my_domain %>"
     vpc:
     <% if !$vpc_deploy_id then %>
-      vpc_name: vpc
       nat_host_name: bastion
       nat_ssh_user: root
-      subnets:
-        <% (1..$azs.size).each do |i| %>
-      - subnet_name: TieredSubnet<%= i-1 %>Private
-        <% end %>
+      vpc_name: vpc
     <% else %>
       deploy_id: <%= $vpc_deploy_id %>
       subnet_pref: all_private

diff --git a/demo/tiered_apps/winapps_lb.yaml b/demo/tiered_apps/winapps_lb.yaml
@@ -2,11 +2,8 @@
     private: true
     vpc:
     <% if !$vpc_deploy_id then %>
+      subnet_pref: all_private
       vpc_name: vpc
-      subnets:
-        <% (1..$azs.size).each do |i| %>
-      - subnet_name: TieredSubnet<%= i-1 %>Private
-        <% end %>
     <% else %>
       deploy_id: <%= $vpc_deploy_id %>
       subnet_pref: all_private

diff --git a/demo/tiered_apps/winapps_pool.yaml b/demo/tiered_apps/winapps_pool.yaml
@@ -20,10 +20,6 @@
       vpc_name: vpc
       nat_host_name: bastion
       nat_ssh_user: root
-      subnets:
-        <% (1..$azs.size).each do |i| %>
-      - subnet_name: TieredSubnet<%= i-1 %>Private
-        <% end %>
     <% else %>
       deploy_id: <%= $vpc_deploy_id %>
     <% end %>