diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-08 11:56:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-08 11:56:04 +0000 |
| commit | 356ada59e8f2b12bb00f72a5dbaeb026a6398224 (patch) | |
| tree | 4ac5fa68e67358877326deb95d94cd6df466806b /ansible | |
| parent | 847d2e4792577d21af8324a36754532763d0f01f (diff) | |
| parent | ba0640cb2a369d94dde91373d832e4c77043f883 (diff) | |
| download | kolla-356ada59e8f2b12bb00f72a5dbaeb026a6398224.tar.gz kolla-356ada59e8f2b12bb00f72a5dbaeb026a6398224.zip | |
Merge "fix magnum [keystone_authtoken] configuration"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/magnum/templates/magnum.conf.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2 index 7deb2b1e4..e567d3239 100644 --- a/ansible/roles/magnum/templates/magnum.conf.j2 +++ b/ansible/roles/magnum/templates/magnum.conf.j2 @@ -29,8 +29,8 @@ region_name = {{ openstack_region_name }} [keystone_auth] auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 -user_domain_id = default -project_domain_id = default +user_domain_name = Default +project_domain_name = Default project_name = service password = {{ magnum_keystone_password }} username = {{ magnum_keystone_user }} @@ -41,8 +41,8 @@ auth_version = v3 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_type = password -project_domain_id = default -user_domain_id = default +project_domain_name = Default +user_domain_name = Default project_name = service username = {{ magnum_keystone_user }} password = {{ magnum_keystone_password }} |