Merge pull request #126 from johnbellone/develop

Add HWRPs for installing and managing consul.

.gitattributes

@@ -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

.gitignore

@@ -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/

.kitchen.yml

@@ -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

.rspec

@@ -1,2 +1,2 @@
 --color
---require spec_helper
+--default-path test/spec

.rubocop.yml

@@ -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

.travis.yml

@@ -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

Berksfile

@@ -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

CHANGELOG.md

@@ -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
@@ -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))