summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJan Klare <j.klare@x-ion.de>2015-04-28 17:42:07 +0200
committerJan Klare <j.klare@x-ion.de>2015-04-28 17:56:15 +0200
commit16a6af50000b6b3847f63b10c3bcadfb2a92a6db (patch)
tree35c7949c1c3eb484a1569afd67f3b715addfd66b /spec
parent226d27a12db4c347991080cec55d410edbc3a67a (diff)
move from bundler to chefdk
- deprecated Gemfile - Updated TESTING.md and README.md - updated Rakefile to use chef exec insted of bundle exec - replaced Runner with SoloRunner in specs Change-Id: If3e3b54c9dbaa8bb51164bc85fd93ff5fc54ec4d
Notes
Notes (review): Verified+2: Jenkins Workflow+1: Mark Vanderwiel <vanderwl@us.ibm.com> Code-Review+2: JJ Asghar <jj@getchef.com> Submitted-by: Jenkins Submitted-at: Wed, 29 Apr 2015 14:30:57 +0000 Reviewed-on: https://review.openstack.org/178250 Project: stackforge/cookbook-openstack-block-storage Branch: refs/heads/master
Diffstat (limited to 'spec')
-rw-r--r--spec/api-opensuse_spec.rb2
-rw-r--r--spec/api-redhat_spec.rb2
-rw-r--r--spec/api_spec.rb2
-rw-r--r--spec/cinder_common-redhat_spec.rb2
-rw-r--r--spec/cinder_common-suse_spec.rb2
-rw-r--r--spec/cinder_common_spec.rb2
-rw-r--r--spec/client-redhat_spec.rb2
-rw-r--r--spec/client_spec.rb2
-rw-r--r--spec/identity_registration_spec.rb2
-rw-r--r--spec/scheduler-redhat_spec.rb2
-rw-r--r--spec/scheduler-suse_spec.rb2
-rw-r--r--spec/scheduler_spec.rb2
-rw-r--r--spec/volume-redhat_spec.rb4
-rw-r--r--spec/volume-suse_spec.rb2
-rw-r--r--spec/volume_spec.rb2
15 files changed, 16 insertions, 16 deletions
diff --git a/spec/api-opensuse_spec.rb b/spec/api-opensuse_spec.rb
index dedca93..22b3443 100644
--- a/spec/api-opensuse_spec.rb
+++ b/spec/api-opensuse_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::api' do 7describe 'openstack-block-storage::api' do
8 describe 'suse' do 8 describe 'suse' do
9 let(:runner) { ChefSpec::Runner.new(SUSE_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(SUSE_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb
index d7ad3a4..afeefa0 100644
--- a/spec/api-redhat_spec.rb
+++ b/spec/api-redhat_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::api' do 7describe 'openstack-block-storage::api' do
8 describe 'redhat' do 8 describe 'redhat' do
9 let(:runner) { ChefSpec::Runner.new(REDHAT_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/api_spec.rb b/spec/api_spec.rb
index cfbac72..9a25580 100644
--- a/spec/api_spec.rb
+++ b/spec/api_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::api' do 7describe 'openstack-block-storage::api' do
8 describe 'ubuntu' do 8 describe 'ubuntu' do
9 let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/cinder_common-redhat_spec.rb b/spec/cinder_common-redhat_spec.rb
index fe364bd..7cff8ca 100644
--- a/spec/cinder_common-redhat_spec.rb
+++ b/spec/cinder_common-redhat_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::cinder-common' do 7describe 'openstack-block-storage::cinder-common' do
8 describe 'rhel' do 8 describe 'rhel' do
9 let(:runner) { ChefSpec::Runner.new(REDHAT_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/cinder_common-suse_spec.rb b/spec/cinder_common-suse_spec.rb
index bfe7f86..4164ea7 100644
--- a/spec/cinder_common-suse_spec.rb
+++ b/spec/cinder_common-suse_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::cinder-common' do 7describe 'openstack-block-storage::cinder-common' do
8 describe 'suse' do 8 describe 'suse' do
9 let(:runner) { ChefSpec::Runner.new(SUSE_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(SUSE_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index 9d0c96e..e9dbec6 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::cinder-common' do 7describe 'openstack-block-storage::cinder-common' do
8 describe 'ubuntu' do 8 describe 'ubuntu' do
9 let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) do 11 let(:chef_run) do
12 node.set['openstack']['mq']['host'] = '127.0.0.1' 12 node.set['openstack']['mq']['host'] = '127.0.0.1'
diff --git a/spec/client-redhat_spec.rb b/spec/client-redhat_spec.rb
index 166ea62..de32b0b 100644
--- a/spec/client-redhat_spec.rb
+++ b/spec/client-redhat_spec.rb
@@ -3,7 +3,7 @@ require_relative 'spec_helper'
3 3
4describe 'openstack-block-storage::client' do 4describe 'openstack-block-storage::client' do
5 describe 'redhat' do 5 describe 'redhat' do
6 let(:runner) { ChefSpec::Runner.new(REDHAT_OPTS) } 6 let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
7 let(:node) { runner.node } 7 let(:node) { runner.node }
8 let(:chef_run) do 8 let(:chef_run) do
9 runner.converge(described_recipe) 9 runner.converge(described_recipe)
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index b58ea36..eae242a 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -3,7 +3,7 @@ require_relative 'spec_helper'
3 3
4describe 'openstack-block-storage::client' do 4describe 'openstack-block-storage::client' do
5 describe 'ubuntu' do 5 describe 'ubuntu' do
6 let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } 6 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
7 let(:node) { runner.node } 7 let(:node) { runner.node }
8 let(:chef_run) do 8 let(:chef_run) do
9 runner.converge(described_recipe) 9 runner.converge(described_recipe)
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index 7f8ef2c..c726343 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::identity_registration' do 7describe 'openstack-block-storage::identity_registration' do
8 describe 'ubuntu' do 8 describe 'ubuntu' do
9 let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/scheduler-redhat_spec.rb b/spec/scheduler-redhat_spec.rb
index 55322e0..5d774fb 100644
--- a/spec/scheduler-redhat_spec.rb
+++ b/spec/scheduler-redhat_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::scheduler' do 7describe 'openstack-block-storage::scheduler' do
8 describe 'redhat' do 8 describe 'redhat' do
9 let(:runner) { ChefSpec::Runner.new(REDHAT_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/scheduler-suse_spec.rb b/spec/scheduler-suse_spec.rb
index c53a04d..791e1a1 100644
--- a/spec/scheduler-suse_spec.rb
+++ b/spec/scheduler-suse_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::scheduler' do 7describe 'openstack-block-storage::scheduler' do
8 describe 'suse' do 8 describe 'suse' do
9 let(:runner) { ChefSpec::Runner.new(SUSE_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(SUSE_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/scheduler_spec.rb b/spec/scheduler_spec.rb
index 037d8c5..6d12195 100644
--- a/spec/scheduler_spec.rb
+++ b/spec/scheduler_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::scheduler' do 7describe 'openstack-block-storage::scheduler' do
8 describe 'ubuntu' do 8 describe 'ubuntu' do
9 let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/volume-redhat_spec.rb b/spec/volume-redhat_spec.rb
index 331d196..6fe3637 100644
--- a/spec/volume-redhat_spec.rb
+++ b/spec/volume-redhat_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::volume' do 7describe 'openstack-block-storage::volume' do
8 describe 'redhat' do 8 describe 'redhat' do
9 let(:runner) { ChefSpec::Runner.new(REDHAT_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(REDHAT_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
@@ -107,7 +107,7 @@ describe 'openstack-block-storage::volume' do
107 107
108 describe 'IBM GPFS volume driver' do 108 describe 'IBM GPFS volume driver' do
109 before do 109 before do
110 @chef_run = ::ChefSpec::Runner.new ::REDHAT_OPTS do |n| 110 @chef_run = ::ChefSpec::SoloRunner.new ::REDHAT_OPTS do |n|
111 n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.ibm.gpfs.GPFSDriver' 111 n.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.ibm.gpfs.GPFSDriver'
112 n.set['openstack']['block-storage']['gpfs']['gpfs_mount_point_base'] = 'volumes' 112 n.set['openstack']['block-storage']['gpfs']['gpfs_mount_point_base'] = 'volumes'
113 end 113 end
diff --git a/spec/volume-suse_spec.rb b/spec/volume-suse_spec.rb
index ad6d32a..6e1019a 100644
--- a/spec/volume-suse_spec.rb
+++ b/spec/volume-suse_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::volume' do 7describe 'openstack-block-storage::volume' do
8 describe 'suse' do 8 describe 'suse' do
9 let(:runner) { ChefSpec::Runner.new(SUSE_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(SUSE_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12
diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb
index f891089..548b795 100644
--- a/spec/volume_spec.rb
+++ b/spec/volume_spec.rb
@@ -6,7 +6,7 @@ require_relative 'spec_helper'
6 6
7describe 'openstack-block-storage::volume' do 7describe 'openstack-block-storage::volume' do
8 describe 'ubuntu' do 8 describe 'ubuntu' do
9 let(:runner) { ChefSpec::Runner.new(UBUNTU_OPTS) } 9 let(:runner) { ChefSpec::SoloRunner.new(UBUNTU_OPTS) }
10 let(:node) { runner.node } 10 let(:node) { runner.node }
11 let(:chef_run) { runner.converge(described_recipe) } 11 let(:chef_run) { runner.converge(described_recipe) }
12 12