From b38278480950efa6a73b86e86a548b98011de3a4 Mon Sep 17 00:00:00 2001
From: Christoph Hartmann <chris@lollyrock.com>
Date: Sun, 29 May 2016 13:35:01 +0200
Subject: [PATCH] update travis and remove openstack gem

---
 .kitchen.vagrant.yml |  3 ++-
 .travis.yml          | 25 ++++++-------------------
 Gemfile              |  4 ----
 gemfile.chef-11      |  5 -----
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/.kitchen.vagrant.yml b/.kitchen.vagrant.yml
index 0a3c13d..7e7e9e8 100644
--- a/.kitchen.vagrant.yml
+++ b/.kitchen.vagrant.yml
@@ -1,9 +1,10 @@
 ---
 driver:
   name: vagrant
+
 provisioner:
   name: chef_solo
-  test_repo_uri: https://github.com/TelekomLabs/tests-ssh-hardening.git
+
 platforms:
 - name: ubuntu-12.04
   driver_config:
diff --git a/.travis.yml b/.travis.yml
index 224001b..1456848 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,37 +8,24 @@ services:
 - docker
 
 before_install:
-- gem install bundler
 - gem --version
+- bundle version
 
 matrix:
   include:
+  # verify lint and unit
   - rvm: 1.9.3
-    gemfile: Gemfile
-    bundler_args: "--without integration guard tools"
-  - rvm: 1.9.3
-    gemfile: gemfile.chef-11
-    bundler_args: "--without integration guard tools"
-  - rvm: 2.2.4
-    gemfile: Gemfile
-    bundler_args: "--without integration guard tools"
-  - rvm: 2.2.4
     gemfile: gemfile.chef-11
     bundler_args: "--without integration guard tools"
-  - rvm: ruby-head
+  - rvm: 2.3.1
     gemfile: Gemfile
     bundler_args: "--without integration guard tools"
-  - rvm: ruby-head
-    gemfile: gemfile.chef-11
-    bundler_args: "--without integration guard tools"
-  - rvm: 2.2.4
+  # integration tests
+  - rvm: 2.3.1
     bundler_args: "--without guard tools"
     script: bundle exec rake test:integration OS='centos oracle'
     gemfile: Gemfile
-  - rvm: 2.2.4
+  - rvm: 2.3.1
     bundler_args: "--without guard tools"
     script: bundle exec rake test:integration OS='ubuntu debian'
     gemfile: Gemfile
-  allow_failures:
-  - rvm: ruby-head
-  - rvm: 1.9.3
diff --git a/Gemfile b/Gemfile
index 9d99311..ea58869 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,10 +39,6 @@ group :integration do
   gem 'kitchen-dokken'
 end
 
-group :openstack do
-  gem 'kitchen-openstack'
-end
-
 group :tools do
   gem 'github_changelog_generator', '~> 1.12.0'
 end
diff --git a/gemfile.chef-11 b/gemfile.chef-11
index 18dc398..7708b3a 100644
--- a/gemfile.chef-11
+++ b/gemfile.chef-11
@@ -2,7 +2,6 @@
 
 source 'https://rubygems.org'
 
-gem 'berkshelf',  '~> 4.0'
 gem 'chef',       '~> 11.18'
 
 # pin dependency for Ruby 1.9.3 since bundler is not
@@ -35,7 +34,3 @@ group :integration do
   gem 'kitchen-dokken'
   gem 'kitchen-sharedtests', '~> 0.2.0'
 end
-
-group :openstack do
-  gem 'kitchen-openstack'
-end