Merge pull request #15 from EMSL-MSC/master

Complete Re-work of Chef-Bareos Cookbook

.kitchen.yml

@@ -4,37 +4,42 @@ driver:
 
 provisioner:
   name: chef_zero
-  require_chef_omnibus: latest
+  require_chef_omnibus: 12.9.41
 
 platforms:
   - name: debian-7.8
-
-  - name: ubuntu-12.04
     run_list:
       - recipe[apt]
-
   - name: ubuntu-14.04
     run_list:
       - recipe[apt]
-
   - name: centos-6.7
+    run_list:
+      - recipe[yum-epel]
+  - name: centos-7.2
+    run_list:
+      - recipe[yum-epel]
 
-  - name: centos-7.0
-
-data_bags_path:    test/integration/data_bags/
-roles_path:        test/integration/roles/
-environments_path: test/integration/environments
+roles_path: test/integration/roles/
 
 suites:
-  - name: aio-server
-    run_list:
-      - role[bareos_server]
-    attributes:
-
-  - name: aio-server-pools
+  - name: bareos-aio-server
     run_list:
-      - role[bareos_server]
+      - role[bareos_director]
     attributes:
       bareos:
-        host_pools: true
-        custom_host_pools: true
+        test_mode: true
+        director:
+          conf:
+            help:
+              test: '# Some String'
+          config_change_notify: 'reload'
+        server:
+          jobs:
+            unmanaged-host-job:
+              Description: '"Unmanaged Host Test Job"'
+              Client: 'unmanaged-client-fd'
+              JobDefs: 'default-def'
+              Type: 'Backup'
+        storage:
+          autochanger_enabled: true

.rubocop.yml

@@ -14,7 +14,7 @@ MethodLength:
   Max: 30
 NumericLiterals:
   Enabled: false
-SingleSpaceBeforeFirstArg:
+SpaceBeforeFirstArg:
+  Enabled: false
+FileName:
   Enabled: false
-Metrics/LineLength:
-  Max: 180

.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 
 script:
-  - bundle exec rspec --color --format progress
-  - bundle exec foodcritic -f any --tags ~FC003 --tags ~FC015 --tags ~FC023 .
+  - bundle exec rspec --default-path spec
+  - bundle exec foodcritic -f any .
   - bundle exec rubocop
 
 notifications:

CHANGELOG.md

@@ -1,11 +1,54 @@
-Bareos Cookbook CHANGELOG
-==========================
+CHANGELOG
+=========
+Chef-Bareos Cookbook
+--------------------
 
-This file is used to list changes made in each version of the bareos cookbook.
+3.0.2
+-----
+- Ian Smith
+
+ - Complete re-work of cookbook, which includes the rework bits from version 2.0
+ - Adding various features including:
+   * Templates populated from hash tables
+   * Up to date README
+   * Graphite plugin deployment recipe
+   * Migrate to postgresql cookbook version 4+
+   * Better testing (rspec), testing against current ruby, need some more rspec tests but no time
+   * Various other updates and enhancements, see README for details
+   * Supermarket Release...finally
+ - ***NOTE*** This release adds functionality that is not backwards compatible. Version lock until you have time to test the migration to version 3.0+
+
+2.2.13
+------
+- Ian Smith
+
+  - Near complete refactoring of how the cookbook works
+    * Adding various ways to add configs based on hashes. Examples in attributes/default.rb
+  - Updating README for usage details
+  - If you are not prepared to use this cookbook version, please lock cookbook version to < 2.0.0
+  - TODO: Refactor main bareos-dir/sd/fd configs to be fully based on hashes like other configs
+    * Remaining attributes support primary bareos-dir/sd/fd configs mostly, used elsewhere but not much
+
+1.0.4
+-----
+- Ian Smith
+
+  - Updating and validating Kitchen testing with new methods
+  - Adding ability to use custom Storage Daemon Configs via wrapper recipe
+  - Fixed a race condition that was likely to come up both in testing and production
+    * Was missing client config on fresh install so restart of dir would fail
+  - Limiting cookbook support for debian to ~>7.0 until we can test on 8+
+  - Refined storage recipe to correctly create client configs based on BOTH role search and solo instances, may need a bit more tuning but should work in most cases
+  - Creating basic Full, Inc, and Diff pools even if not used, just as a place holder (default)
+  - Minor fixes
+  - Larger version bump for version clarity
+  - Updated Docs
+  - Adding support for Fedora and RHEL 6/7
+  - Reworked the available repos to some better logic
 
 0.1.4
 -----
-- Ian smith
+- Ian Smith
 
   - Updating README
   - Revamping server.rb recipe to better utilize the bareos-dir.d directory
@@ -22,15 +65,15 @@ This file is used to list changes made in each version of the bareos cookbook.
 
 0.1.3
 -----
-- Ian smith
+- Ian Smith
 
   - Updating README
   - Updating CHANGELOG
   - Updating metadata file
 
 0.1.2
 -----
-- Léonard TAVAE
+- Leonard TAVAE
 
   - The License has changed (Apache 2.0)
   - The cookbook now passed foodcritic, rubocop and tailor with success
@@ -50,10 +93,10 @@ This file is used to list changes made in each version of the bareos cookbook.
 
 0.1.1
 -----
-- Léonard TAVAE - Major release
+- Leonard TAVAE - Major release
 
 0.1.0
 -----
-- Léonard TAVAE - Initial release of bareos
+- Leonard TAVAE - Initial release of bareos
 
 - - -

Gemfile

@@ -1,21 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'berkshelf'
-
-# Uncomment these lines if you want to live on the Edge:
-#
-# group :development do
-#   gem "berkshelf", github: "berkshelf/berkshelf"
-#   gem "vagrant", github: "mitchellh/vagrant", tag: "v1.6.3"
-# end
-#
-# group :plugins do
-#   gem "vagrant-berkshelf", github: "berkshelf/vagrant-berkshelf"
-#   gem "vagrant-omnibus", github: "schisamo/vagrant-omnibus"
-# end
-
 gem 'test-kitchen'
 gem 'kitchen-vagrant'
 gem 'rubocop'
 gem 'foodcritic'
-gem 'rspec'
+gem 'chefspec'
+gem 'rspec', '>= 3.4'
+gem 'rake'

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 Léonard TAVAE
+Copyright (C) 2016 Leonard TAVAE
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ 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.
+limitations under the License.