openstack/cookbook-openstack-object-storage
Code Issues Proposed changes

remove duplicate attributes from attributes/default.rb

Browse Source 
We should be testing with the default attributes, not setting our own,
for the default scenario. These were mostly duplicates from the default
attributes file and none of them require any changes to the tests, so it
seems they were pretty useless.

Implements: blueprint object-storage-cleanup
Change-Id: I1fd8c9ae413f497820bdac7212ce35340f838ec5
This commit is contained in:
Ionuț Arțăriși
2014-03-05 14:05:45 +01:00
parent 8e26539b22
commit 50300f7df0
10 changed files with 0 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spec/account_spec.rb
View File

@@ -2,21 +2,12 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::account-server' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['lsb']['code'] = 'precise'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['network']['account-bind-ip'] = '10.0.0.1'
@node.set['openstack']['object-storage']['network']['account-bind-port'] = '8080'
@node.set['openstack']['object-storage']['disk_enum_expr'] = "[{ 'sda' => {}}]"
@node.set['openstack']['object-storage']['disk_test_filter'] = [
'candidate =~ /sd[^a]/ or candidate =~ /hd[^a]/ or candidate =~ /vd[^a]/ or candidate =~ /xvd[^a]/',

10
spec/common_spec.rb
View File

@@ -2,22 +2,12 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::common' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['platform_family'] = 'debian'
@node.set['lsb']['codename'] = 'precise'
@node.set['openstack']['object-storage']['release'] = 'havana'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['git_builder_ip'] = '10.0.0.10'
# TODO: this does not work
# ::Chef::Log.should_receive(:info).with('chefspec: precise-updates/havana')

9
spec/container_spec.rb
View File

@@ -2,23 +2,14 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::container-server' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['lsb']['code'] = 'precise'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['network']['container-bind-ip'] = '10.0.0.1'
@node.set['openstack']['object-storage']['network']['container-bind-port'] = '8080'
@node.set['openstack']['object-storage']['container-server']['allowed_sync_hosts'] = ['host1', 'host2', 'host3']
@node.set['openstack']['object-storage']['container-bind-port'] = '8080'
@node.set['openstack']['object-storage']['disk_enum_expr'] = "[{ 'sda' => {}}]"
@node.set['openstack']['object-storage']['disk_test_filter'] = [
'candidate =~ /sd[^a]/ or candidate =~ /hd[^a]/ or candidate =~ /vd[^a]/ or candidate =~ /xvd[^a]/',

10
spec/disks_spec.rb
View File

@@ -2,22 +2,12 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::disks' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['platform_family'] = 'debian'
@node.set['lsb']['codename'] = 'precise'
@node.set['openstack']['object-storage']['release'] = 'havana'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['git_builder_ip'] = '10.0.0.10'
@node.set['openstack']['object-storage']['disk_enum_expr'] = "[{ 'sda' => {}}]"
@node.set['openstack']['object-storage']['disk_test_filter'] = [
'candidate =~ /sd[^a]/ or candidate =~ /hd[^a]/ or candidate =~ /vd[^a]/ or candidate =~ /xvd[^a]/',

11
spec/management_spec.rb
View File

@@ -2,23 +2,12 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::management-server' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['lsb']['code'] = 'precise'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['statistics']['enabled'] = true
@node.set['openstack']['object-storage']['swauth_source'] = 'package'
@node.set['openstack']['object-storage']['platform']['swauth_packages'] = ['swauth']
@chef_run.converge 'openstack-object-storage::management-server'
end

9
spec/object_spec.rb
View File

@@ -2,21 +2,12 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::object-server' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['lsb']['code'] = 'precise'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['network']['object-bind-ip'] = '10.0.0.1'
@node.set['openstack']['object-storage']['network']['object-bind-port'] = '8080'
@node.set['openstack']['object-storage']['disk_enum_expr'] = "[{ 'sda' => {}}]"
@node.set['openstack']['object-storage']['disk_test_filter'] = [
'candidate =~ /sd[^a]/ or candidate =~ /hd[^a]/ or candidate =~ /vd[^a]/ or candidate =~ /xvd[^a]/',

11
spec/proxy_spec.rb
View File

@@ -2,11 +2,6 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::proxy-server' do
#--------------
# UBUNTU
#--------------
describe 'ubuntu' do
before do
@@ -14,12 +9,6 @@ describe 'openstack-object-storage::proxy-server' do
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['cpu']['total'] = 6
@node.set['lsb']['code'] = 'precise'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['platform']['swauth_packages'] = ['swauth']
@node.set['openstack']['object-storage']['swauth_source'] = 'package'
@node.set['openstack']['object-storage']['network']['proxy-bind-ip'] = '10.0.0.1'
@node.set['openstack']['object-storage']['network']['proxy-bind-port'] = '8080'
@chef_run.converge 'openstack-object-storage::proxy-server'
end

10
spec/ring-repo_spec.rb
View File

@@ -2,22 +2,12 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::ring-repo' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['platform_family'] = 'debian'
@node.set['lsb']['codename'] = 'precise'
@node.set['openstack']['object-storage']['release'] = 'havana'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['git_builder_ip'] = '10.0.0.10'
@chef_run.converge 'openstack-object-storage::ring-repo'
end

10
spec/rsync_spec.rb
View File

@@ -2,22 +2,12 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::rsync' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['platform_family'] = 'debian'
@node.set['lsb']['codename'] = 'precise'
@node.set['openstack']['object-storage']['release'] = 'havana'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@node.set['openstack']['object-storage']['git_builder_ip'] = '10.0.0.10'
@chef_run.converge 'openstack-object-storage::rsync'
end

7
spec/storage-common_spec.rb
View File

@@ -2,19 +2,12 @@
require_relative 'spec_helper'
describe 'openstack-object-storage::storage-common' do
#-------------------
# UBUNTU
#-------------------
describe 'ubuntu' do
before do
swift_stubs
@chef_run = ::ChefSpec::Runner.new ::UBUNTU_OPTS
@node = @chef_run.node
@node.set['lsb']['code'] = 'precise'
@node.set['openstack']['object-storage']['authmode'] = 'swauth'
@chef_run.converge 'openstack-object-storage::storage-common'
end