diff --git a/ceilometer/cinder_client.py b/ceilometer/cinder_client.py index 3575aefd75..55f6b01b70 100644 --- a/ceilometer/cinder_client.py +++ b/ceilometer/cinder_client.py @@ -20,7 +20,7 @@ from ceilometer import keystone_client SERVICE_OPTS = [ cfg.StrOpt('cinder', - default='volumev3', + default='block-storage', help='Cinder service type.'), ] diff --git a/ceilometer/tests/unit/test_cinder_client.py b/ceilometer/tests/unit/test_cinder_client.py index 0fb327387c..7ae50195d4 100644 --- a/ceilometer/tests/unit/test_cinder_client.py +++ b/ceilometer/tests/unit/test_cinder_client.py @@ -34,7 +34,7 @@ class TestCinderClient(base.BaseTestCase): group='service_credentials', region_name='RegionOne', interface='publicURL') - self.conf.config(group='service_types', cinder='volumev3') + self.conf.config(group='service_types', cinder='block-storage') self.mock_get_session = self.useFixture(fixtures.MockPatch( 'ceilometer.keystone_client.get_session')) @@ -48,7 +48,7 @@ class TestCinderClient(base.BaseTestCase): oslo_conf=self.CONF, region_name='RegionOne', block_storage_interface='publicURL', - service_types={'volumev3'}) + service_types={'block-storage'}) def test_list_volumes_returns_volumes(self): result = self.client.list_volumes(search_opts={'all_projects': True}) diff --git a/releasenotes/notes/cinder-official-service_type-a4e8d60b8b890604.yaml b/releasenotes/notes/cinder-official-service_type-a4e8d60b8b890604.yaml new file mode 100644 index 0000000000..53f23385e7 --- /dev/null +++ b/releasenotes/notes/cinder-official-service_type-a4e8d60b8b890604.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``[service_types] cinder`` option now defaults to ``block-storage``, + which is the official and authorized service type name for cinder.