Use keystone_authtoken macros for auth
Also remove middleware parameters from glance-registry service Depends-on: I7353611fde5a7916d707603315a613607e8b4013 Change-Id: I38748ee9ba2f65ec640324ea1961da8ac1aa5297
This commit is contained in:
parent
e35d1ae32c
commit
744be5e29c
|
@ -19,17 +19,7 @@ show_multiple_locations = true
|
|||
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}
|
||||
max_retries = -1
|
||||
|
||||
[keystone_authtoken]
|
||||
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
|
||||
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
|
||||
auth_type = password
|
||||
project_domain_id = default
|
||||
user_domain_id = default
|
||||
project_name = service
|
||||
username = {{ glance.user }}
|
||||
password = {{ glance.password }}
|
||||
memcached_servers = {{ address('memcached', memcached.port) }}
|
||||
|
||||
{{ keystone_authtoken(glance.user, glance.password) }}
|
||||
|
||||
[paste_deploy]
|
||||
flavor = keystone
|
||||
|
|
|
@ -12,17 +12,6 @@ bind_port = {{ glance.registry_port.cont }}
|
|||
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}
|
||||
max_retries = -1
|
||||
|
||||
[keystone_authtoken]
|
||||
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
|
||||
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
|
||||
auth_type = password
|
||||
project_domain_id = default
|
||||
user_domain_id = default
|
||||
project_name = service
|
||||
username = {{ glance.user }}
|
||||
password = {{ glance.password }}
|
||||
memcached_servers = {{ address('memcached', memcached.port) }}
|
||||
|
||||
[paste_deploy]
|
||||
flavor = keystone
|
||||
|
||||
|
|
|
@ -27,15 +27,14 @@ service:
|
|||
command: glance-manage db_sync
|
||||
- name: glance-user-create
|
||||
dependencies:
|
||||
- keystone
|
||||
- keystone-create-domain
|
||||
type: single
|
||||
command: openstack user create --domain default --password {{ glance.password }} {{ glance.user }}
|
||||
command: openstack user create --domain {{ service_account.domain }} --password {{ glance.password }} {{ glance.user }}
|
||||
- name: glance-role-add
|
||||
dependencies:
|
||||
- glance-user-create
|
||||
- keystone-create-project
|
||||
type: single
|
||||
command: openstack role add --project service --user {{ glance.user }} admin
|
||||
command: openstack role add --domain {{ service_account.domain }} --user {{ glance.user }} admin
|
||||
- name: glance-service-create
|
||||
dependencies:
|
||||
- keystone
|
||||
|
|
Loading…
Reference in New Issue