Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HWRPs for installing and managing consul. #126

Merged
merged 22 commits into from
Jul 25, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b061edd
Merging in changes from master branch.
Jul 25, 2015
c60909e
Fixes the permissions on the private key.
Jun 15, 2015
ae2e692
Adds data bag stub for consul integration testing.
Jun 15, 2015
25eccc8
Updates the directories and tests for /etc/consul.d/ssl.
Jun 15, 2015
beda08b
Fixes a few bits after a code review.
johnbellone Jun 16, 2015
faef8cf
Adds support for running Consul under runit provider.
johnbellone Jun 16, 2015
07dca12
Cleans up the rubocop bits.
johnbellone Jun 16, 2015
e41c3d0
Fixes a few more issues while test-kitchen converging.
johnbellone Jun 16, 2015
71e8e33
Removes the poise-runit cookbook after speaking with @coderanger.
johnbellone Jun 17, 2015
64a4532
Fixes integration testing issues with CentOS 6.6 and upstart.
Jul 1, 2015
b26421c
Fixes a bunch of issues with integration test harness.
Jul 1, 2015
56eddd3
Adds support for creating consul service but not enabling.
Jul 4, 2015
fc18d6c
Fixes issues with unit tests failing.
Jul 4, 2015
275877e
Fixes permissions for key and certificate.
Jul 10, 2015
6cc4c6c
Adds more test converage to Consul configuration.
Jul 10, 2015
fa8ac56
Adds more unit tests for resources.
Jul 10, 2015
ea9c597
Modifies the watch resource to write out as a file.
Jul 10, 2015
ccc0c3f
Updates the README and defaults for various HWRP.
Jul 10, 2015
a74c9b2
Adds test-kitchen support for Windows platform.
Jul 23, 2015
8ad3ad2
Bumps version of libartifact-cookbook ~> 1.3.
Jul 23, 2015
2267367
Implements the Consul definition HWRP.
Jul 23, 2015
6371cd3
Fixes a few issues during the merge/rebase.
Jul 25, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Gemfile export-ignore
Berksfile export-ignore
Vagrantfile export-ignore
Thorfile export-ignore
Guardfile export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.gitmodules export-ignore
.gitattributes export-ignore
65 changes: 49 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,55 @@
# Ignore docs files
_gh_pages
_site
.ruby-version
.node-version
Gemfile.lock

# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.zip
*.vi
*~
*#
.#*
\#*#
.*.sw[a-z]
*.un~
pkg/

# Berkshelf
.vagrant
/cookbooks
Berksfile.lock
# OS or Editor folders
.DS_Store
._*
Thumbs.db
.cache
.project
.settings
.tmproj
*.esproj
nbproject
*.sublime-project
*.sublime-workspace
.idea

# Bundler
Gemfile.lock
bin/*
.bundle/*
# Komodo
*.komodoproject
.komodotools

# grunt-html-validation
validation-status.json
validation-report.json

.kitchen/
.kitchen.local.yml
# Folders to ignore
bin
node_modules
tmp
vendor
.bundle

# Chef specifics to ignore
.chef
.chefdk
.kitchen
.vagrant
Berksfile.lock
coverage/
89 changes: 17 additions & 72 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,96 +8,41 @@ provisioner:
platforms:
- name: ubuntu-14.04
- name: ubuntu-12.04
- name: centos-7.0
- name: centos-6.5
- name: centos-7.1
- name: centos-6.6
- name: windows-2012r2
driver_config:
network:
- ["forwarded_port", {guest: 5985, host: 5985}]
communicator: winrm
gui: true
box_url: https://wrock.blob.core.windows.net/vhds/vbox2012r2.box
customize:
usbehci: "off"

suites:
- name: default
excludes:
- windows-2012r2
run_list:
- recipe[consul::default]
attributes:
consul:
datacenter: FortMeade
bind_interface: eth0
advertise_interface: eth0
encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
- name: source
excludes:
- windows-2012r2
run_list:
- recipe[consul::default]
attributes:
consul:
install_method: source
- name: packages
run_list:
- recipe[consul::default]
attributes:
consul:
datacenter: FortMeade
bind_interface: eth0
advertise_interface: eth0
encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
install_method: packages
excludes:
- centos-7.0
- centos-6.5
- windows-2012r2
- name: runit
excludes:
- windows-2012r2
run_list:
- recipe[consul::default]
attributes:
consul:
datacenter: FortMeade
init_style: runit
- name: ui
config: &default-config
bootstrap: true
server: true
datacenter: FortMeade
encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
excludes:
- windows-2012r2
- name: source
run_list:
- recipe[consul::default]
- recipe[consul::ui]
attributes:
consul:
serve_ui: true
client_interface: eth0
- name: cluster
config: *default-config
service:
install_method: source
excludes:
- windows-2012r2
- name: package
run_list:
- recipe[consul::default]
attributes:
consul:
service_mode: cluster
bootstrap_expect: 1
- name: atlas
config: *default-config
service:
install_method: package
excludes:
- windows-2012r2
run_list:
- recipe[consul::default]
attributes:
consul:
atlas_autojoin: true
atlas_cluster: <%= ENV.fetch('ATLAS_CLUSTER', 'example/cluster') %>
atlas_token: <%= ENV.fetch('ATLAS_TOKEN', 'NOT_REAL') %>
- name: windows
includes:
- windows-2012r2
run_list:
- recipe[consul::default]
attributes:
consul:
install_method: windows
service_user: vagrant
- centos-7.1
- centos-6.6
2 changes: 1 addition & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
--color
--require spec_helper
--default-path test/spec
42 changes: 37 additions & 5 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
---
inherit_from: .rubocop_todo.yml
AlignParameters:
Enabled: false

Encoding:
Enabled: false

ClassLength:
Enabled: false

MethodLength:
Enabled: false

LineLength:
Enabled: false

Documentation:
Enabled: false

PerceivedComplexity:
Enabled: false

CyclomaticComplexity:
Enabled: false

Style/FileName:
Enabled: false

Style/ClassAndModuleChildren:
Enabled: false

Metrics/AbcSize:
Enabled: false

AllCops:
Exclude:
- 'bin/**/*'
- 'vendor/**/*'
- 'test/**/*'
- 'spec/**/*'
- 'Guardfile'
- 'test/**/*_spec.rb'

Style/GuardClause:
Enabled: false
51 changes: 0 additions & 51 deletions .rubocop_todo.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .tailor

This file was deleted.

11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
---
language: ruby
notifications:
slack: blpsi:eHp3Czg42iGzaTgG8sAFeD9v
script: bin/rspec
rvm:
- 2.1
- 2.2
branches:
only:
- master
builder_args: --jobs 7
notifications:
irc:
channels:
- 'chat.freenode.net#bloomberg'
use_notice: true
skip_join: true
template:
- "%{message} (%{author}): %{build_url}"
matrix:
fast_finish: true
8 changes: 2 additions & 6 deletions Berksfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
source 'https://supermarket.getchef.com'

source 'https://supermarket.chef.io'
cookbook 'chef-vault', git: 'https://github.com/johnbellone/chef-vault-cookbook'
metadata

group :test do
cookbook "consul_spec", path: "spec/fixtures/cookbooks/consul_spec"
end
13 changes: 1 addition & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
# 0.11.1
Minor fixes and README updates.

# 0.11
Minor fixes. (Actually) last release prior to 1.0.0.

* Enhancements
- Windows support. [@gdavison](https://github.com/gdavison)

# 0.10.1
Minor fixes. Last major release prior to 1.0.0.
# 1.0.0

# 0.10
Fixes several bugs, minor enhancements and changes default version of
Expand All @@ -33,7 +23,6 @@ Consul to 0.5.2.
* Lock to Chef 11 compatible version of libarchive cookbook

# 0.9.0

* Enhancements
- Adds support for publishing to statsd URL. [@akerekes](https://github.com/akerekes)
- Adds support for Arch Linux. ([@logankoester](https://github.com/logankoester))
Expand Down
Loading