diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-20 12:26:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-20 12:26:44 +0000 |
| commit | ee7ce6eebdd9fca7e5e7df5ad61ba58e4d2c1129 (patch) | |
| tree | 28003be5020d676a7e6743cbae7aaf37d9f73eb8 /ansible | |
| parent | aa378bfa3ab4aa04a2042ea313ec667c1e6541f6 (diff) | |
| parent | 2042ad285036b44695e7f274d07a39618f9c7749 (diff) | |
| download | kolla-ee7ce6eebdd9fca7e5e7df5ad61ba58e4d2c1129.tar.gz kolla-ee7ce6eebdd9fca7e5e7df5ad61ba58e4d2c1129.zip | |
Merge "Deprecate old auth parameters of ironic in nova.conf"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 02b1a2041..7a635c66f 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -93,10 +93,12 @@ html5proxy_port = {{ nova_spicehtml5proxy_port }} {% if service_name == "nova-compute-ironic" %} [ironic] -admin_username = {{ ironic_keystone_user }} -admin_password = {{ ironic_keystone_password }} -admin_url = {{ openstack_auth.auth_url }}/v2.0 -admin_tenant_name = service +username = {{ ironic_keystone_user }} +password = {{ ironic_keystone_password }} +auth_url = {{ openstack_auth.auth_url }}/v3 +project_name = service +user_domain_name = default +project_domain_name = default api_endpoint = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port }}/v1 {% endif %} |