summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSamuel Cassiba <s@cassiba.com>2017-08-20 10:11:45 -0400
committerSamuel Cassiba <s@cassiba.com>2017-08-25 09:15:49 -0400
commit60a38b538db57ce691c2b66d1588be156d9fa948 (patch)
tree4c044cc48f47e3d05ba72d4076f25aed34fa2336 /spec
parenta29984d3012a119e5a2c2b8e292446940000916e (diff)
Initial block-storage Pike updates
- Changed the default linter to cookstyle - cinder-group-active was missing a Provides header for the SysV init script - Switched the qemu package to SCL for CentOS to get a newer release - Normalized template banner comment Change-Id: Iec59e0c8e3cb0b83db92a0a9f8db34a40953351f
Notes
Notes (review): Code-Review+2: Jan Klare <j.klare@cloudbau.de> Workflow+1: Christoph Albers <c.albers@x-ion.de> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 11 Sep 2017 09:15:14 +0000 Reviewed-on: https://review.openstack.org/495563 Project: openstack/cookbook-openstack-block-storage Branch: refs/heads/master
Diffstat (limited to 'spec')
-rw-r--r--spec/cinder_common_spec.rb2
-rw-r--r--spec/identity_registration_spec.rb2
-rw-r--r--spec/spec_helper.rb8
-rw-r--r--spec/volume-redhat_spec.rb4
4 files changed, 8 insertions, 8 deletions
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index 2a11540..fc43260 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -208,7 +208,7 @@ describe 'openstack-block-storage::cinder-common' do
208 %r{^exec_dirs = /sbin,/usr/sbin,/bin,/usr/bin$}, 208 %r{^exec_dirs = /sbin,/usr/sbin,/bin,/usr/bin$},
209 /^use_syslog = false$/, 209 /^use_syslog = false$/,
210 /^syslog_log_facility = syslog$/, 210 /^syslog_log_facility = syslog$/,
211 /^syslog_log_level = ERROR$/ 211 /^syslog_log_level = ERROR$/,
212 ].each do |line| 212 ].each do |line|
213 expect(chef_run).to render_file(file.name).with_content(line) 213 expect(chef_run).to render_file(file.name).with_content(line)
214 end 214 end
diff --git a/spec/identity_registration_spec.rb b/spec/identity_registration_spec.rb
index 162f994..f588379 100644
--- a/spec/identity_registration_spec.rb
+++ b/spec/identity_registration_spec.rb
@@ -17,7 +17,7 @@ describe 'openstack-block-storage::identity_registration' do
17 openstack_username: 'admin', 17 openstack_username: 'admin',
18 openstack_api_key: 'emc_test_pass', 18 openstack_api_key: 'emc_test_pass',
19 openstack_project_name: 'admin', 19 openstack_project_name: 'admin',
20 openstack_domain_name: 'default' 20 openstack_domain_name: 'default',
21 } 21 }
22 service_name = 'cinderv2' 22 service_name = 'cinderv2'
23 service_type = 'volumev2' 23 service_type = 'volumev2'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 061067c..eb82788 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,12 +13,12 @@ LOG_LEVEL = :fatal
13REDHAT_OPTS = { 13REDHAT_OPTS = {
14 platform: 'redhat', 14 platform: 'redhat',
15 version: '7.1', 15 version: '7.1',
16 log_level: LOG_LEVEL 16 log_level: LOG_LEVEL,
17}.freeze 17}.freeze
18UBUNTU_OPTS = { 18UBUNTU_OPTS = {
19 platform: 'ubuntu', 19 platform: 'ubuntu',
20 version: '16.04', 20 version: '16.04',
21 log_level: LOG_LEVEL 21 log_level: LOG_LEVEL,
22}.freeze 22}.freeze
23 23
24shared_context 'block-storage-stubs' do 24shared_context 'block-storage-stubs' do
@@ -116,7 +116,7 @@ shared_examples 'creates_cinder_conf' do |service, user, group, action = :restar
116 /^project_domain_name = Default/, 116 /^project_domain_name = Default/,
117 %r{^auth_uri = http://127.0.0.1:5000/v3$}, 117 %r{^auth_uri = http://127.0.0.1:5000/v3$},
118 %r{^auth_url = http://127.0.0.1:35357/v3$}, 118 %r{^auth_url = http://127.0.0.1:35357/v3$},
119 /^password = cinder-pass$/ 119 /^password = cinder-pass$/,
120 ].each do |line| 120 ].each do |line|
121 expect(chef_run).to render_config_file(file.name) 121 expect(chef_run).to render_config_file(file.name)
122 .with_section_content('keystone_authtoken', line) 122 .with_section_content('keystone_authtoken', line)
@@ -125,7 +125,7 @@ shared_examples 'creates_cinder_conf' do |service, user, group, action = :restar
125 125
126 it 'has oslo_messaging_notifications conf values' do 126 it 'has oslo_messaging_notifications conf values' do
127 [ 127 [
128 /^driver = cinder.openstack.common.notifier.rpc_notifier$/ 128 /^driver = cinder.openstack.common.notifier.rpc_notifier$/,
129 ].each do |line| 129 ].each do |line|
130 expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_notifications', line) 130 expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_notifications', line)
131 end 131 end
diff --git a/spec/volume-redhat_spec.rb b/spec/volume-redhat_spec.rb
index 60a8fff..1830442 100644
--- a/spec/volume-redhat_spec.rb
+++ b/spec/volume-redhat_spec.rb
@@ -23,8 +23,8 @@ describe 'openstack-block-storage::volume' do
23 expect(chef_run).not_to upgrade_package('MySQL-python') 23 expect(chef_run).not_to upgrade_package('MySQL-python')
24 end 24 end
25 25
26 it 'upgrades qemu img package' do 26 it 'upgrades qemu-img-ev package' do
27 expect(chef_run).to upgrade_package('qemu-img') 27 expect(chef_run).to upgrade_package('qemu-img-ev')
28 end 28 end
29 29
30 it 'upgrades cinder iscsi package' do 30 it 'upgrades cinder iscsi package' do