openstack
/
kolla
Code Issues Proposed changes

Merge "Use auth_type instead of deprecated auth_plugin"

This commit is contained in:
Jenkins 2016-01-17 16:02:56 +00:00 committed by Gerrit Code Review
parent c8228da023 181b4947dd
commit b4edee1c2f
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -46,7 +46,7 @@ connection = mysql+pymysql://{{ cinder_database_user }}:{{ cinder_database_passw
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

2
ansible/roles/glance/templates/glance-api.conf.j2
View File

@ -22,7 +22,7 @@ connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_passw
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

2
ansible/roles/glance/templates/glance-registry.conf.j2
View File

@ -16,7 +16,7 @@ connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_passw
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

2
ansible/roles/heat/templates/heat.conf.j2
View File

@ -38,7 +38,7 @@ connection = mysql+pymysql://{{ heat_database_user }}:{{ heat_database_password
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

2
ansible/roles/ironic/templates/ironic.conf.j2
View File

@ -21,7 +21,7 @@ connection = mysql+pymysql://{{ ironic_database_user }}:{{ ironic_database_passw
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

4
ansible/roles/magnum/templates/magnum.conf.j2
View File

@ -20,7 +20,7 @@ region_name = {{ openstack_region_name }}
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
@ -30,7 +30,7 @@ password = {{ magnum_keystone_password }}
[trustee]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

2
ansible/roles/mistral/templates/mistral.conf.j2
View File

@ -18,7 +18,7 @@ connection = mysql+pymysql://{{ mistral_database_user }}:{{ mistral_database_pas
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

2
ansible/roles/murano/templates/murano.conf.j2
View File

@ -18,7 +18,7 @@ connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_passw
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

4
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -31,7 +31,7 @@ service_plugins = router
[nova]
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
region_name = {{ openstack_region_name }}
@ -57,7 +57,7 @@ connection = mysql+pymysql://{{ neutron_database_user }}:{{ neutron_database_pas
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

4
ansible/roles/nova/templates/nova.conf.j2
View File

@ -117,7 +117,7 @@ metadata_proxy_shared_secret = {{ metadata_secret }}
service_metadata_proxy = true
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_name = default
user_domain_id = default
project_name = service
@ -130,7 +130,7 @@ connection = mysql+pymysql://{{ nova_database_user }}:{{ nova_database_password
[keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service

2
ansible/roles/swift/templates/proxy-server.conf.j2
View File

@ -31,7 +31,7 @@ use = egg:swift#proxy_logging
paste.filter_factory = keystonemiddleware.auth_token:filter_factory
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service