Merge "Use keystone_authtoken macros for auth"
This commit is contained in:
commit
e2186f559d
|
@ -18,17 +18,7 @@ endpoint_type = internalURL
|
|||
[database]
|
||||
connection = mysql+pymysql://{{ heat.db.username }}:{{ heat.db.password }}@{{ address(service.database) }}/{{ heat.db.name }}{% if percona.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %}
|
||||
|
||||
[keystone_authtoken]
|
||||
auth_version = v3
|
||||
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
|
||||
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
|
||||
auth_type = password
|
||||
project_domain_id = default
|
||||
user_domain_id = default
|
||||
project_name = service
|
||||
username = {{ heat.user }}
|
||||
password = {{ heat.password }}
|
||||
memcached_servers = {{ address('memcached', memcached.port) }}
|
||||
{{ keystone_authtoken.keystone_authtoken(heat.user, heat.password) }}
|
||||
|
||||
[trustee]
|
||||
user_domain_id = default
|
||||
|
|
|
@ -26,19 +26,19 @@ service:
|
|||
command: heat-manage db_sync
|
||||
- name: heat-user-create
|
||||
dependencies:
|
||||
- keystone-create-project
|
||||
- keystone-create-domain
|
||||
type: single
|
||||
command:
|
||||
openstack user create --domain default --password {{ heat.password }} {{ heat.user }}
|
||||
openstack user create --domain {{ service_account.domain }} --password {{ heat.password }} {{ heat.user }}
|
||||
- name: heat-admin-role-add
|
||||
dependencies:
|
||||
- heat-user-create
|
||||
type: single
|
||||
command:
|
||||
openstack role add --project service --user {{ heat.user }} admin
|
||||
openstack role add --domain {{ service_account.domain }} --user {{ heat.user }} admin
|
||||
- name: heat-service-create
|
||||
dependencies:
|
||||
- keystone-create-project
|
||||
- keystone
|
||||
type: single
|
||||
command:
|
||||
openstack service create --name heat --description "OpenStack orchestration service" orchestration
|
||||
|
|
Loading…
Reference in New Issue