Merge "Use keystone_authtoken macros for auth"
This commit is contained in:
commit
0de42f1ebc
|
@ -8,6 +8,9 @@ configs:
|
|||
password: password
|
||||
name: murano
|
||||
|
||||
username: murano
|
||||
password: murano
|
||||
|
||||
logging_debug: false
|
||||
|
||||
networking:
|
||||
|
|
|
@ -18,16 +18,7 @@ connection = mysql+pymysql://{{ murano.db.username }}:{{ murano.db.password }}@{
|
|||
use_trusts = True
|
||||
packages_service = murano
|
||||
|
||||
[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_plugin = password
|
||||
project_domain_id = default
|
||||
user_domain_id = default
|
||||
project_name = service
|
||||
username = {{ murano.db.username }}
|
||||
password = {{ murano.db.password }}
|
||||
{{ keystone_authtoken.keystone_authtoken(murano.username, murano.password) }}
|
||||
|
||||
[rabbitmq]
|
||||
host = {{ k8s_external_ip }}
|
||||
|
|
|
@ -30,12 +30,12 @@ service:
|
|||
- murano.conf
|
||||
- name: murano-user-create
|
||||
type: single
|
||||
command: openstack user create --project service --password {{ murano.db.password }} {{ murano.db.username }}
|
||||
command: openstack user create --domain {{ service_account.domain }} --password {{ murano.password }} {{ murano.username }}
|
||||
dependencies:
|
||||
- keystone-create-project
|
||||
- keystone-create-domain
|
||||
- name: murano-role-add
|
||||
type: single
|
||||
command: openstack role add --project service --user {{ murano.db.username }} admin
|
||||
command: openstack role add --domain {{ service_account.domain }} --user {{ murano.username }} admin
|
||||
dependencies:
|
||||
- murano-user-create
|
||||
- name: murano-service-create
|
||||
|
|
Loading…
Reference in New Issue