openstack
/
cookbook-openstack-image
Code Issues Proposed changes

Cleanup options deprecated for mitaka 

Some options have been deprecated for Mitaka, replace them with the new
variants.

Change-Id: I1e05f7c1d3e604389b90c66931af153a5861e433
This commit is contained in:
Mark Vanderwiel 2016-04-13 10:56:34 -05:00
parent c5f518bd75
commit a0de93e9ca
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/glance_api_conf.rb
View File

@ -14,7 +14,7 @@ default['openstack']['image_api']['conf'].tap do |conf|
conf['paste_deploy']['flavor'] = 'keystone'
# [keystone_authtoken] section
conf['keystone_authtoken']['auth_plugin'] = 'v2password'
conf['keystone_authtoken']['auth_type'] = 'v2password'
conf['keystone_authtoken']['region_name'] = node['openstack']['region']
conf['keystone_authtoken']['username'] = 'glance'
conf['keystone_authtoken']['tenant_name'] = 'service'

2
attributes/glance_registry_conf.rb
View File

@ -11,7 +11,7 @@ default['openstack']['image_registry']['conf'].tap do |conf|
conf['paste_deploy']['flavor'] = 'keystone'
# [keystone_authtoken] section
conf['keystone_authtoken']['auth_plugin'] = 'v2password'
conf['keystone_authtoken']['auth_type'] = 'v2password'
conf['keystone_authtoken']['region_name'] = node['openstack']['region']
conf['keystone_authtoken']['username'] = 'glance'
conf['keystone_authtoken']['tenant_name'] = 'service'

2
spec/api_spec.rb
View File

@ -97,7 +97,7 @@ describe 'openstack-image::api' do
it do
[
/^auth_plugin = v2password$/,
/^auth_type = v2password$/,
/^region_name = RegionOne$/,
/^username = glance$/,
/^tenant_name = service$/,

2
spec/registry_spec.rb
View File

@ -88,7 +88,7 @@ describe 'openstack-image::registry' do
it do
[
/^auth_plugin = v2password$/,
/^auth_type = v2password$/,
/^region_name = RegionOne$/,
/^username = glance$/,
/^tenant_name = service$/,