Cleanup options deprecated for mitaka

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

Change-Id: Id350abd82df48c1e00e4b2bb8bc944658ddd85e6

attributes/default.rb

@@ -37,8 +37,6 @@ default['openstack']['bind_service']['all']['network']['port'] = 9696
 # config)
 default['openstack']['network']['syslog']['use'] = false
 # Name of the plugin to load
-default['openstack']['network']['nova']['auth_plugin'] = 'v2password'
-# Name of the plugin to load
 default['openstack']['network']['identity-api']['auth']['version'] = 'v2.0'
 # Set dbsync command timeout value
 default['openstack']['network']['dbsync_timeout'] = 3600

attributes/neutron_conf.rb

@@ -19,13 +19,13 @@ default['openstack']['network']['conf'].tap do |conf|
   end
 
   # [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'] = 'neutron'
   conf['keystone_authtoken']['tenant_name'] = 'service'
 
   # [nova] section
-  conf['nova']['auth_plugin'] = 'v2password'
+  conf['nova']['auth_type'] = 'v2password'
   conf['nova']['region_name'] = node['openstack']['region']
   conf['nova']['username'] = 'nova'
   conf['nova']['tenant_name'] = 'service'

spec/default_spec.rb

@@ -117,7 +117,8 @@ describe 'openstack-network' do
         /^tenant_name = service$/,
         /^username = neutron$/,
         %r{^auth_url = http://127\.0\.0\.1:5000/v2\.0$},
-        /^password = neutron-pass$/
+        /^password = neutron-pass$/,
+        /^auth_type = v2password$/
       ].each do |line|
         it do
           expect(chef_run).to render_config_file(file.name)
@@ -125,7 +126,10 @@ describe 'openstack-network' do
         end
       end
       [
-        /^region_name = RegionOne$/
+        /^region_name = RegionOne$/,
+        /^auth_type = v2password$/,
+        /^username = nova$/,
+        /^tenant_name = service$/
       ].each do |line|
         it do
           expect(chef_run).to render_config_file(file.name)