Skip to content

Commit

Permalink
Merge pull request #3 from rightscale-cookbooks/white_14_02_acu128798…
Browse files Browse the repository at this point in the history
…_three_tier_tags

White 14 02 acu128798 three tier tags
  • Loading branch information
douglaswth committed Feb 21, 2014
2 parents d65ff7c + d814f76 commit ec71651
Show file tree
Hide file tree
Showing 32 changed files with 2,704 additions and 35 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ VERSION
.kitchen/
.kitchen.local.yml

.yardoc
doc

cache_dir/
43 changes: 41 additions & 2 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ platforms:
suites:
- name: default
run_list:
- recipe[rs-machine_tag]
- recipe[rs-machine_tag::monitoring]
- recipe[rightscale_tag]
- recipe[rightscale_tag::monitoring]
attributes:
rightscale:
instance_uuid: 01-ABCDEFG123456
Expand All @@ -32,3 +32,42 @@ suites:
- null
- ""
- 10.0.2.15

# Load Balancer server tests
- name: load_balancer
run_list:
- recipe[rightscale_tag]
- recipe[fake::load_balancer]
attributes:
rightscale:
instance_uuid: 04-DBCDEFG123459
cloud:
provider: vagrant
public_ips: ['33.33.33.11']
private_ips: ['10.0.2.16']

# Application server tests
- name: application
run_list:
- recipe[rightscale_tag]
- recipe[fake::application]
attributes:
rightscale:
instance_uuid: 02-BBCDEFG123457
cloud:
provider: vagrant
public_ips: ['33.33.33.10']
private_ips: ['10.0.2.15']

# Database server tests
- name: database
run_list:
- recipe[rightscale_tag]
- recipe[fake::database]
attributes:
rightscale:
instance_uuid: 03-CBCDEFG123458
cloud:
provider: vagrant
public_ips: ['33.33.33.12']
private_ips: ['10.0.2.17']
1 change: 1 addition & 0 deletions .yardopts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--markup markdown
4 changes: 4 additions & 0 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
site :opscode

metadata

group :integration do
cookbook 'fake', path: './test/cookbooks/fake'
end
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ gem 'berkshelf'
gem 'thor-foodcritic'

group :integration do
gem 'machine_tag'
gem 'test-kitchen', '~> 1.1.0'
gem 'kitchen-vagrant'
gem 'strainer', '~> 3.3.0'
gem 'chefspec', '~> 1.3.0'
gem 'strainer', '~> 3.3'
gem 'chefspec', '~> 3.2'
gem 'travis-lint'
end
Loading

0 comments on commit ec71651

Please sign in to comment.