From a0de93e9ca5daf364684fa875752ad699d4bb7de Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Wed, 13 Apr 2016 10:56:34 -0500 Subject: [PATCH] Cleanup options deprecated for mitaka Some options have been deprecated for Mitaka, replace them with the new variants. Change-Id: I1e05f7c1d3e604389b90c66931af153a5861e433 --- attributes/glance_api_conf.rb | 2 +- attributes/glance_registry_conf.rb | 2 +- spec/api_spec.rb | 2 +- spec/registry_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/attributes/glance_api_conf.rb b/attributes/glance_api_conf.rb index e42f3a3..ad2e055 100644 --- a/attributes/glance_api_conf.rb +++ b/attributes/glance_api_conf.rb @@ -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' diff --git a/attributes/glance_registry_conf.rb b/attributes/glance_registry_conf.rb index da7197c..75559f2 100644 --- a/attributes/glance_registry_conf.rb +++ b/attributes/glance_registry_conf.rb @@ -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' diff --git a/spec/api_spec.rb b/spec/api_spec.rb index 1ef853f..6d987c5 100644 --- a/spec/api_spec.rb +++ b/spec/api_spec.rb @@ -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$/, diff --git a/spec/registry_spec.rb b/spec/registry_spec.rb index b333f64..24aeda7 100644 --- a/spec/registry_spec.rb +++ b/spec/registry_spec.rb @@ -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$/,