From 5ad15c040fdc115bca9efb1c952279988a2a48b3 Mon Sep 17 00:00:00 2001 From: Trung Trinh Date: Mon, 15 Dec 2014 20:23:34 +1400 Subject: [PATCH] Correct default service_name for nova_catalog*_info config option The default service_name in config option (nova_catalog_info and nova_catalog_admin_info) was mistakenly put as 'nova'. Consequently, it is impossible to invoke novaclient APIs from Cinder code without changing the default value of those config options. The correct service_name defined in Keystone's config file "/etc/keystone/default_catalog.templates" is: catalog.RegionOne.compute.name = Compute Service. This change replaces 'nova' with 'Compute Service' for default value of 'nova_catalog*_info' config options. Change-Id: Idee3585a08efa1d6af1f4ee2b74e8cefb05cc54f Closes-Bug: 1401800 --- cinder/compute/nova.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cinder/compute/nova.py b/cinder/compute/nova.py index c58f1055e..d72a596f9 100644 --- a/cinder/compute/nova.py +++ b/cinder/compute/nova.py @@ -27,13 +27,13 @@ from cinder.openstack.common import log as logging nova_opts = [ cfg.StrOpt('nova_catalog_info', - default='compute:nova:publicURL', + default='compute:Compute Service:publicURL', help='Match this value when searching for nova in the ' 'service catalog. Format is: separated values of ' 'the form: ' '::'), cfg.StrOpt('nova_catalog_admin_info', - default='compute:nova:adminURL', + default='compute:Compute Service:adminURL', help='Same as nova_catalog_info, but for admin endpoint.'), cfg.StrOpt('nova_endpoint_template', default=None, -- 2.45.2