Switch default cinder API to V2

Cinder v1 is deprecated and using v1 emits a warning (introduced in
Id8abbbb4d9b0c8c49ab51fc3d958ef0d487467f8). So update the default value
to Cinder v2.

DocImpact

Closes-Bug: #1390131

Change-Id: Ica650962c9354d741b464ec152e9e1c6d0d5fa10

nova/tests/test_cinder.py

@@ -257,6 +257,8 @@ class CinderTestCase(test.NoDBTestCase):
             "name": "cinder",
             "endpoints": [{"publicURL": "http://localhost:8776/v1/project_id"}]
         }]
+        cinder.CONF.set_override('catalog_info',
+                                 'volume:cinder:publicURL', group='cinder')
         self.context = context.RequestContext('username', 'project_id',
                                               service_catalog=catalog)
         cinder.cinderclient(self.context)
@@ -331,8 +333,6 @@ class CinderV2TestCase(test.NoDBTestCase):
             "name": "cinderv2",
             "endpoints": [{"publicURL": "http://localhost:8776/v2/project_id"}]
         }]
-        cinder.CONF.set_override('catalog_info',
-                                 'volumev2:cinder:publicURL', group='cinder')
         self.context = context.RequestContext('username', 'project_id',
                                               service_catalog=catalog)
 

nova/volume/cinder.py

@@ -36,7 +36,7 @@ from nova.openstack.common import log as logging
 
 cinder_opts = [
     cfg.StrOpt('catalog_info',
-            default='volume:cinder:publicURL',
+            default='volumev2:cinderv2:publicURL',
             help='Info to match when looking for cinder in the service '
                  'catalog. Format is: separated values of the form: '
                  '<service_type>:<service_name>:<endpoint_type>',