Merge "Use keystone_authtoken macros for auth"
This commit is contained in:
commit
a0320952ab
|
@ -19,17 +19,7 @@ show_multiple_locations = true
|
||||||
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||||
max_retries = -1
|
max_retries = -1
|
||||||
|
|
||||||
[keystone_authtoken]
|
{{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }}
|
||||||
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]
|
[paste_deploy]
|
||||||
flavor = keystone
|
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 }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address(service.database) }}/{{ glance.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||||
max_retries = -1
|
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]
|
[paste_deploy]
|
||||||
flavor = keystone
|
flavor = keystone
|
||||||
|
|
||||||
|
|
|
@ -30,15 +30,14 @@ service:
|
||||||
command: glance-manage db_sync
|
command: glance-manage db_sync
|
||||||
- name: glance-user-create
|
- name: glance-user-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- keystone
|
- keystone-create-domain
|
||||||
type: single
|
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
|
- name: glance-role-add
|
||||||
dependencies:
|
dependencies:
|
||||||
- glance-user-create
|
- glance-user-create
|
||||||
- keystone-create-project
|
|
||||||
type: single
|
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
|
- name: glance-service-create
|
||||||
dependencies:
|
dependencies:
|
||||||
- keystone
|
- keystone
|
||||||
|
|
Loading…
Reference in New Issue