summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/api.rb2
-rw-r--r--recipes/backup.rb2
-rw-r--r--recipes/cinder-common.rb8
-rw-r--r--recipes/scheduler.rb2
-rw-r--r--recipes/volume.rb2
-rw-r--r--spec/spec_helper.rb2
6 files changed, 9 insertions, 9 deletions
diff --git a/recipes/api.rb b/recipes/api.rb
index 287ae5f..bfbc21d 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -37,7 +37,7 @@ platform_options['cinder_api_packages'].each do |pkg|
37 end 37 end
38end 38end
39 39
40db_type = node['openstack']['db']['block-storage']['service_type'] 40db_type = node['openstack']['db']['block_storage']['service_type']
41node['openstack']['db']['python_packages'][db_type].each do |pkg| 41node['openstack']['db']['python_packages'][db_type].each do |pkg|
42 package pkg do 42 package pkg do
43 action :upgrade 43 action :upgrade
diff --git a/recipes/backup.rb b/recipes/backup.rb
index 7a158a5..3c1b11a 100644
--- a/recipes/backup.rb
+++ b/recipes/backup.rb
@@ -27,7 +27,7 @@ platform_options['cinder_backup_packages'].each do |pkg|
27 end 27 end
28end 28end
29 29
30db_type = node['openstack']['db']['block-storage']['service_type'] 30db_type = node['openstack']['db']['block_storage']['service_type']
31node['openstack']['db']['python_packages'][db_type].each do |pkg| 31node['openstack']['db']['python_packages'][db_type].each do |pkg|
32 package pkg do 32 package pkg do
33 action :upgrade 33 action :upgrade
diff --git a/recipes/cinder-common.rb b/recipes/cinder-common.rb
index 3e40703..b560b4d 100644
--- a/recipes/cinder-common.rb
+++ b/recipes/cinder-common.rb
@@ -29,20 +29,20 @@ platform_options['cinder_common_packages'].each do |pkg|
29 end 29 end
30end 30end
31 31
32db_user = node['openstack']['db']['block-storage']['username'] 32db_user = node['openstack']['db']['block_storage']['username']
33db_pass = get_password 'db', 'cinder' 33db_pass = get_password 'db', 'cinder'
34node.default['openstack']['block-storage']['conf_secrets'] 34node.default['openstack']['block-storage']['conf_secrets']
35 .[]('database')['connection'] = 35 .[]('database')['connection'] =
36 db_uri('block-storage', db_user, db_pass) 36 db_uri('block_storage', db_user, db_pass)
37 37
38if node['openstack']['endpoints']['db']['enabled_slave'] 38if node['openstack']['endpoints']['db']['enabled_slave']
39 node.default['openstack']['block-storage']['conf_secrets'] 39 node.default['openstack']['block-storage']['conf_secrets']
40 .[]('database')['slave_connection'] = 40 .[]('database')['slave_connection'] =
41 db_uri('block-storage', db_user, db_pass, true) 41 db_uri('block_storage', db_user, db_pass, true)
42end 42end
43 43
44if node['openstack']['mq']['service_type'] == 'rabbit' 44if node['openstack']['mq']['service_type'] == 'rabbit'
45 node.default['openstack']['block-storage']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'block-storage' 45 node.default['openstack']['block-storage']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'block_storage'
46end 46end
47 47
48glance_api_endpoint = internal_endpoint 'image_api' 48glance_api_endpoint = internal_endpoint 'image_api'
diff --git a/recipes/scheduler.rb b/recipes/scheduler.rb
index 0ae374e..b9c7b34 100644
--- a/recipes/scheduler.rb
+++ b/recipes/scheduler.rb
@@ -32,7 +32,7 @@ platform_options['cinder_scheduler_packages'].each do |pkg|
32 end 32 end
33end 33end
34 34
35db_type = node['openstack']['db']['block-storage']['service_type'] 35db_type = node['openstack']['db']['block_storage']['service_type']
36node['openstack']['db']['python_packages'][db_type].each do |pkg| 36node['openstack']['db']['python_packages'][db_type].each do |pkg|
37 package pkg do 37 package pkg do
38 action :upgrade 38 action :upgrade
diff --git a/recipes/volume.rb b/recipes/volume.rb
index 7e06a98..79edf8b 100644
--- a/recipes/volume.rb
+++ b/recipes/volume.rb
@@ -38,7 +38,7 @@ platform_options['cinder_volume_packages'].each do |pkg|
38 end 38 end
39end 39end
40 40
41db_type = node['openstack']['db']['block-storage']['service_type'] 41db_type = node['openstack']['db']['block_storage']['service_type']
42node['openstack']['db']['python_packages'][db_type].each do |pkg| 42node['openstack']['db']['python_packages'][db_type].each do |pkg|
43 package pkg do 43 package pkg do
44 action :upgrade 44 action :upgrade
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5a04965..073be16 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -53,7 +53,7 @@ shared_context 'block-storage-stubs' do
53 .with('user', 'ibmnas_admin') 53 .with('user', 'ibmnas_admin')
54 .and_return('test_pass') 54 .and_return('test_pass')
55 allow_any_instance_of(Chef::Recipe).to receive(:rabbit_transport_url) 55 allow_any_instance_of(Chef::Recipe).to receive(:rabbit_transport_url)
56 .with('block-storage') 56 .with('block_storage')
57 .and_return('rabbit://guest:mypass@127.0.0.1:5672') 57 .and_return('rabbit://guest:mypass@127.0.0.1:5672')
58 stub_command('/usr/sbin/httpd -t').and_return(true) 58 stub_command('/usr/sbin/httpd -t').and_return(true)
59 stub_command('/usr/sbin/apache2 -t').and_return(true) 59 stub_command('/usr/sbin/apache2 -t').and_return(true)