Skip to content

Commit

Permalink
Merge pull request #4 from eGT-Labs/demo_update
Browse files Browse the repository at this point in the history
Demo update - changes to /demo and site_cookbooks/demo only
Working minimum set simple-server, simple-windows, simple-server-php
Work in progress on others
  • Loading branch information
rpattcorner committed Apr 22, 2015
2 parents 6902543 + 70865f2 commit 16c06ab
Show file tree
Hide file tree
Showing 26 changed files with 541 additions and 403 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,4 @@ examples.
####Removing an application stack

**mu-cleanup** removes an application stack created by **mu-deploy**

88 changes: 88 additions & 0 deletions demo/auto-launch-config-ami-on-the-fly.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
---
<%
$azs = listAZs
current_vpc = MU.myVPC
%>
admins:
-
email: [email protected]
name: xyz
appname: demo
loadbalancers:
-
listeners:
-
instance-port: 80
instance-protocol: HTTP
lb-port: 80
lb-protocol: HTTP
name: demo
region: us-east-1
server_pools:
-
basis:
launch-config:
name: demo
server: portal
size: t1.micro
loadbalancers:
-
concurrent-load-balancer: demo
max-size: 4
min-size: 2
name: autoscale_demo
ssh_user: ubuntu
zones:
- us-east-1b
- us-east-1c
- us-east-1d
servers:
-
ingress_rules:
-
hosts:
- 0.0.0.0/0
port: 80
-
hosts:
- 0.0.0.0/0
port: 443
name: portal
platform: ubuntu
run_list:
- "recipe[apache2]"
size: m3.medium
ssh_user: ubuntu
storage:
-
size: 15
vpc:
<% if $vpc_deploy_id then %>
deploy_id: <%= $vpc_deploy_id %>
<% elsif current_vpc %>
vpc_id: <%= current_vpc %>
subnet-pref: public
<% else %>
vpc_name: vpc
subnets:
<% (1..$azs.size).each do |i| %>
- subnet_name: Subnet<%= i-1 %>Public
<% end %>
<% end %>
<% unless $vpc_deploy_id or current_vpc then %>
vpcs:
- name: vpc
route-tables:
- name: internet
routes:
- destination_network: 0.0.0.0/0
gateway: "#INTERNET"
subnets:
<% $azs.each.with_index do |az, i| %>
- name: Subnet<%= i %>Public
ip_block: 10.0.<%= i %>.0/24
availability-zone: "<%= az %>"
route-table: internet
<% end %>
<% end %>

File renamed without changes.
43 changes: 0 additions & 43 deletions demo/multi-ebs-device.json

This file was deleted.

55 changes: 55 additions & 0 deletions demo/multi-ebs-device.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<%
$azs = listAZs
current_vpc = MU.myVPC
%>
---
appname: "demo"
servers:
-
name: "windows"
platform: "windows"
winrm_user: "Administrator"
size: "m3.large"
storage:
-
size: 70
device: "xvdg"
-
size: 100
-
size: 100
ingress_rules:
-
port: 3389
hosts:
- "23.30.31.61/32"
run_list: []
dependencies: []
vpc:
<% if $vpc_deploy_id then %>
deploy_id: <%= $vpc_deploy_id %>
<% elsif current_vpc %>
vpc_id: <%= current_vpc %>
<% else %>
vpc_name: vpc
<% end %>
admins:
-
name: "John Stange"
email: "[email protected]"
<% unless $vpc_deploy_id or current_vpc then %>
vpcs:
- name: vpc
route-tables:
- name: internet
routes:
- destination_network: 0.0.0.0/0
gateway: "#INTERNET"
subnets:
<% $azs.each.with_index do |az, i| %>
- name: Subnet<%= i %>Public
ip_block: 10.0.<%= i %>.0/24
availability-zone: "<%= az %>"
route-table: internet
<% end %>
<% end %>
51 changes: 51 additions & 0 deletions demo/simple-server-php.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<%
current_vpc = MU.myVPC
%>
---
appname: demo
servers:
- name: php
ami_id: ami-5db4a934
ssh_user: ubuntu
size: m3.medium
static_ip:
assign_ip: true
storage:
- size: 70
ingress_rules:
- port: 80
hosts:
- 0.0.0.0/0
- port: 443
hosts:
- 0.0.0.0/0
run_list:
- recipe[apache2]
- recipe[demo::php]
vpc:
<% if $vpc_deploy_id then %>
deploy_id: <%= $vpc_deploy_id %>
<% elsif current_vpc %>
vpc_id: <%= current_vpc %>
<% else %>
vpc_name: vpc
<% end %>
admins:
- name: Admin
email: [email protected]
<% unless $vpc_deploy_id or current_vpc then %>
vpcs:
- name: vpc
route-tables:
- name: internet
routes:
- destination_network: 0.0.0.0/0
gateway: "#INTERNET"
subnets:
<% $azs.each.with_index do |az, i| %>
- name: Subnet<%= i %>Public
ip_block: 10.0.<%= i %>.0/24
availability-zone: "<%= az %>"
route-table: internet
<% end %>
<% end %>
54 changes: 0 additions & 54 deletions demo/simple-server-rails.json

This file was deleted.

82 changes: 82 additions & 0 deletions demo/simple-server-rails.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<%
$azs = listAZs
%>
---
appname: "demo"
servers:
-
name: "rails"
ssh_user: "ubuntu"
platform: "ubuntu"
storage:
-
size: 15
run_list:
- "recipe[demo::rails]"
size: "m3.medium"
associate_public_ip: true
static_ip:
assign_ip: true
vpc:
<% if $vpc_deploy_id then %>
deploy_id: <%= $vpc_deploy_id %>
<% elsif current_vpc %>
vpc_id: <%= current_vpc %>
<% else %>
vpc_name: vpc
<% end %>
ingress_rules:
-
port: 80
hosts:
- "0.0.0.0/0"
-
port: 443
hosts:
- "0.0.0.0/0"
dependencies:
-
name: "fss"
type: "database"
<% unless $vpc_deploy_id or current_vpc then %>
vpcs:
- name: vpc
route-tables:
- name: internet
routes:
- destination_network: 0.0.0.0/0
gateway: "#INTERNET"
subnets:
<% $azs.each.with_index do |az, i| %>
- name: Subnet<%= i %>Public
ip_block: 10.0.<%= i %>.0/24
availability-zone: "<%= az %>"
route-table: internet
<% end %>
<% end %>
databases:
-
name: "fss"
engine: "mysql"
size: "db.t1.micro"
storage: 5
port: 3306
vpc:
<% if $vpc_deploy_id then %>
deploy_id: <%= $vpc_deploy_id %>
subnet_pref: all_public
<% elsif current_vpc %>
vpc_id: <%= current_vpc %>
subnet_pref: all_public
<% else %>
vpc_name: vpc
subnets:
<% (1..$azs.size).each do |i| %>
- subnet_name: Subnet<%= i-1 %>Public
<% end %>
<% end %>
admins:
-
name: "Zach Rowe"
email: "[email protected]"

9 changes: 0 additions & 9 deletions demo/simple-server.json

This file was deleted.

Loading

0 comments on commit 16c06ab

Please sign in to comment.