Skip to content

Commit

Permalink
add hostfile cookbook move associate-public-ip to correct place
Browse files Browse the repository at this point in the history
  • Loading branch information
Ami Rahav committed Dec 14, 2014
1 parent 0b37310 commit e105703
Show file tree
Hide file tree
Showing 37 changed files with 1,738 additions and 10 deletions.
11 changes: 1 addition & 10 deletions applications/geoshape_geonode/pool.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name":"geonode",
"min-size":1,
"max-size":1,
"associate-public-ip":true,
<% if $ubuntu then %>
"ssh_user": "ubuntu",
<% end %>
Expand Down Expand Up @@ -64,15 +65,6 @@
}
]
<% end %>
},
"application_attributes":{
"glusterfs_master_ip": "<%=$glusterfs_master_ip%>",
<% if $existing_deployment == true then %>
"existing_deployment":true
<% else %>
"existing_deployment":false
<% end %>

},
"vault_access" : [{
"vault" : "geoshape_geonode",
Expand All @@ -86,7 +78,6 @@
"basis":{
"launch-config":{
"name":"geoshape_geonode",
"associate-public-ip":true,
<% if $centos then %>
<%= CAP::Config.include("../centos-ami.json") %>,
<% elsif $ubuntu then %>
Expand Down
21 changes: 21 additions & 0 deletions cookbooks/hostsfile/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
*~
*#
.#*
\#*#
.*.sw[a-z]
*.un~
*.tmp
*.bk
*.bkup
.kitchen.local.yml
Berksfile.lock
Gemfile.lock

.bundle/
.cache/
.kitchen/
.vagrant/
.vagrant.d/
bin/
tmp/
vendor/
25 changes: 25 additions & 0 deletions cookbooks/hostsfile/.kitchen.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
driver:
name: vagrant

provisioner:
name: chef_zero
require_chef_omnibus: 11.8.0

platforms:
- name: ubuntu-12.04

suites:
- name: append
run_list: fake::append
- name: append_existing
run_list: fake::append_existing
- name: create
run_list: fake::create
- name: create_if_missing
run_list: fake::create_if_missing
- name: default
run_list: fake::default
- name: options
run_list: fake::options
- name: unique
run_list: fake::unique
5 changes: 5 additions & 0 deletions cookbooks/hostsfile/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
script: bundle exec rake travis:ci
6 changes: 6 additions & 0 deletions cookbooks/hostsfile/Berksfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://api.berkshelf.com'
metadata

group :integration do
cookbook 'fake', path: 'test/fixtures/cookbooks/fake'
end
73 changes: 73 additions & 0 deletions cookbooks/hostsfile/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
hostsfile Cookbook CHANGELOG
=======================
This file is used to list changes made in each version of the hostsfile cookbook.


v2.4.5 (2014-06-24)
-------------------
- Fix notifications and why-run mode


v2.4.4 (2014-02-25)
-------------------
- Bump Berkshelf version
- Remove scope pieces from IPv6 addresses


v2.4.3 (2014-02-01)
-------------------

- Package custom ChefSpec matchers
- Update testing harness
- Avoid using `Chef::Application.fatal!`
- Use Chef::Resource::File for atomic updates


v2.4.2
------
- Fix Travis CI integration
- Remove newline characters
- Allow specifying a custom hostsfile path


v2.4.1
------
- Force a new upload to the community site


v2.4.0
------
- Convert everything to Ruby 1.9 syntax because I'm tired of people removing trailing commas despite the **massive** warning in the README: ([#29](https://github.com/customink-webops/hostsfile/issues/29), [#30](https://github.com/customink-webops/hostsfile/issues/30), [#32](https://github.com/customink-webops/hostsfile/issues/32), [#33](https://github.com/customink-webops/hostsfile/issues/33), [#34](https://github.com/customink-webops/hostsfile/issues/34), [#35](https://github.com/customink-webops/hostsfile/issues/35), [#36](https://github.com/customink-webops/hostsfile/issues/36), [#38](https://github.com/customink-webops/hostsfile/issues/38), [#39](https://github.com/customink-webops/hostsfile/issues/39))
- Update to the latest and greatest testing gems and practices
- Remove strainer in favor of a purer solution
- Update `.gitignore` to ignore additional files
- Add more platforms to the `.kitchen.yml`
- Use `converge_by` and support whyruny mode

v2.0.0
------
- Completely manage the hostsfile, ensuring no duplicate entries

v1.0.2
------
- Support Windows (thanks @igantt-daptiv)
- Specs + Travis support
- Throw fatal error if hostsfile does not exist (@jkerzner)
- Write priorities in hostsfile so they are read on subsequent Chef runs

v0.2.0
------
- Updated README to require Ruby 1.9
- Allow hypens in hostnames
- Ensure newline at end of file
- Allow priority ordering in hostsfile

v0.1.1
------
- Fixed issue #1
- Better unique object filtering
- Better handing of aliases

v0.1.0
------
- Initial release
10 changes: 10 additions & 0 deletions cookbooks/hostsfile/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
source 'https://rubygems.org'

gem 'berkshelf', '~> 3.1'
gem 'chefspec', '~> 4.0'
gem 'foodcritic', '~> 3.0'

group :integration do
gem 'test-kitchen', '~> 1.1'
gem 'kitchen-vagrant', '~> 0.14'
end
13 changes: 13 additions & 0 deletions cookbooks/hostsfile/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2012 Seth Vargo, CustomInk, LLC

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Loading

0 comments on commit e105703

Please sign in to comment.