diff options
| -rw-r--r-- | ironic/cmd/conductor.py | 4 | ||||
| -rw-r--r-- | ironic/conf/service_catalog.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/keystone-auth-3155762c524e44df.yaml | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ironic/cmd/conductor.py b/ironic/cmd/conductor.py index 794b52ce3..14728a5a2 100644 --- a/ironic/cmd/conductor.py +++ b/ironic/cmd/conductor.py @@ -41,8 +41,8 @@ SECTIONS_WITH_AUTH = ( def _check_auth_options(conf): missing = [] for section in SECTIONS_WITH_AUTH: - if not auth.load_auth(conf, section): - missing.append('[%s]' % section) + if not auth.load_auth(conf, section): + missing.append('[%s]' % section) if missing: link = "http://docs.openstack.org/releasenotes/ironic/newton.html" LOG.warning(_LW("Failed to load authentification credentials from " diff --git a/ironic/conf/service_catalog.py b/ironic/conf/service_catalog.py index 610d20e1d..56b9d0a41 100644 --- a/ironic/conf/service_catalog.py +++ b/ironic/conf/service_catalog.py @@ -18,7 +18,7 @@ from oslo_config import cfg from ironic.common.i18n import _ from ironic.conf import auth -SERVCIE_CATALOG_GROUP = cfg.OptGroup( +SERVICE_CATALOG_GROUP = cfg.OptGroup( 'service_catalog', title='Access info for Ironic service user', help=_('Holds credentials and session options to access ' @@ -26,7 +26,7 @@ SERVCIE_CATALOG_GROUP = cfg.OptGroup( def register_opts(conf): - auth.register_auth_opts(conf, SERVCIE_CATALOG_GROUP.name) + auth.register_auth_opts(conf, SERVICE_CATALOG_GROUP.name) def list_opts(): diff --git a/releasenotes/notes/keystone-auth-3155762c524e44df.yaml b/releasenotes/notes/keystone-auth-3155762c524e44df.yaml index 0dfaf818a..36e4ad614 100644 --- a/releasenotes/notes/keystone-auth-3155762c524e44df.yaml +++ b/releasenotes/notes/keystone-auth-3155762c524e44df.yaml @@ -4,7 +4,7 @@ upgrade: New way of configuring access credentials for OpenStack services clients. For each service both Keystone session options (timeout, SSL-related ones) and Keystone auth_plugin options - (auth_url, auth_type and correspondig auth_plugin options) + (auth_url, auth_type and corresponding auth_plugin options) should be specified in the config section for this service. Config section affected are @@ -15,7 +15,7 @@ upgrade: * ``[service_catalog]`` *new section* for Ironic service user, used to discover Ironic endpoint from Keystone Catalog - This enables fine tuning of authentification for each service. + This enables fine tuning of authentication for each service. Backward-compatible options handling is provided using values from ``[keystone_authtoken]`` config section, @@ -34,7 +34,7 @@ upgrade: - New config section ``[service_catalog]`` for access credentials used to discover Ironic API URL from Keystone Catalog. - Previousely credentials from ``[keystone_authtoken]`` section were used, + Previously credentials from ``[keystone_authtoken]`` section were used, which is now deprecated for such purpose. fixes: - Do not rely on keystonemiddleware config options for instantiating |