Merge "Convert hyphens to underscores for service names"

This commit is contained in:
Zuul 2019-01-08 15:36:11 +00:00 committed by Gerrit Code Review
commit ea5c38398f
6 changed files with 9 additions and 9 deletions

View File

@ -37,7 +37,7 @@ platform_options['cinder_api_packages'].each do |pkg|
end
end
db_type = node['openstack']['db']['block-storage']['service_type']
db_type = node['openstack']['db']['block_storage']['service_type']
node['openstack']['db']['python_packages'][db_type].each do |pkg|
package pkg do
action :upgrade

View File

@ -27,7 +27,7 @@ platform_options['cinder_backup_packages'].each do |pkg|
end
end
db_type = node['openstack']['db']['block-storage']['service_type']
db_type = node['openstack']['db']['block_storage']['service_type']
node['openstack']['db']['python_packages'][db_type].each do |pkg|
package pkg do
action :upgrade

View File

@ -29,20 +29,20 @@ platform_options['cinder_common_packages'].each do |pkg|
end
end
db_user = node['openstack']['db']['block-storage']['username']
db_user = node['openstack']['db']['block_storage']['username']
db_pass = get_password 'db', 'cinder'
node.default['openstack']['block-storage']['conf_secrets']
.[]('database')['connection'] =
db_uri('block-storage', db_user, db_pass)
db_uri('block_storage', db_user, db_pass)
if node['openstack']['endpoints']['db']['enabled_slave']
node.default['openstack']['block-storage']['conf_secrets']
.[]('database')['slave_connection'] =
db_uri('block-storage', db_user, db_pass, true)
db_uri('block_storage', db_user, db_pass, true)
end
if node['openstack']['mq']['service_type'] == 'rabbit'
node.default['openstack']['block-storage']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'block-storage'
node.default['openstack']['block-storage']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'block_storage'
end
glance_api_endpoint = internal_endpoint 'image_api'

View File

@ -32,7 +32,7 @@ platform_options['cinder_scheduler_packages'].each do |pkg|
end
end
db_type = node['openstack']['db']['block-storage']['service_type']
db_type = node['openstack']['db']['block_storage']['service_type']
node['openstack']['db']['python_packages'][db_type].each do |pkg|
package pkg do
action :upgrade

View File

@ -38,7 +38,7 @@ platform_options['cinder_volume_packages'].each do |pkg|
end
end
db_type = node['openstack']['db']['block-storage']['service_type']
db_type = node['openstack']['db']['block_storage']['service_type']
node['openstack']['db']['python_packages'][db_type].each do |pkg|
package pkg do
action :upgrade

View File

@ -53,7 +53,7 @@ shared_context 'block-storage-stubs' do
.with('user', 'ibmnas_admin')
.and_return('test_pass')
allow_any_instance_of(Chef::Recipe).to receive(:rabbit_transport_url)
.with('block-storage')
.with('block_storage')
.and_return('rabbit://guest:mypass@127.0.0.1:5672')
stub_command('/usr/sbin/httpd -t').and_return(true)
stub_command('/usr/sbin/apache2 -t').and_return(true)