Update ironic auth options for Keystone v3 auth

Code Issues Proposed changes

The auth parameters `admin_username`, `admin_password`,
`admin_tenant_name` and `admin_url` of the [ironic] config
option group are now deprecated and will be removed in a
future release. Using these parameters will log a warning.
Please use `username`, `password`, `project_name `and
`auth_url` instead.
Update ironic auth options for Keystone v3 API support.
The link[1] can explain.
http://git.openstack.org/cgit/openstack/nova/tree/nova/conf/ironic.py#n38
Change-Id: I33f3cb1b52a8c69b7a2711b47662b02967a74265

This commit is contained in:

ZhongShengping

2016年09月04日 09:18:23 +08:00

committed by Jesse Pretorius (odyssey4me)

parent b838299a53

commit 81aee820b5

1 changed files with 9 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

14
templates/nova.conf.j2

View File

@@ -251,12 +251,16 @@ rabbit_use_ssl = {{ nova_rabbitmq_use_ssl }}

{% if nova_virt_type == 'ironic' %}

[ironic]

# TODO(mrda): These should be changed to support the Keystone v3 API

admin_username = {{ ironic_service_name }}

admin_password = {{ ironic_service_password }}

admin_tenant_name = {{ ironic_service_project_name }}

admin_url = {{ keystone_service_adminuri }}/v2.0

username = {{ ironic_service_name }}

password = {{ ironic_service_password }}

project_name = {{ ironic_service_project_name }}

user_domain_name = {{ ironic_service_domain_name | default("Default") }}

project_domain_name = {{ ironic_service_domain_name | default("Default") }}

auth_url = {{ keystone_service_adminurl }}

insecure = {{ keystone_service_adminuri_insecure | bool }}

api_endpoint = {{ ironic_service_adminurl }}

auth_type = {{ ironic_keystone_auth_plugin }}

{% endif %}

{% if nova_virt_type in ['kvm', 'qemu', 'xen'] %}

Update ironic auth options for Keystone v3 auth

14 templates/nova.conf.j2 Unescape Escape View File

14
templates/nova.conf.j2

View File