x
/
fuel-ccp-ironic
Code Issues Proposed changes

Use keystone_authtoken macros for auth 

Change-Id: I75929b12f0111261adca18f3562b01b534cf36df
This commit is contained in:
Sergey Reshetnyak 2017-02-13 13:42:23 +03:00
parent 3ec258a731
commit 4d43a1bc81
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/files/ironic.conf.j2
View File

@ -21,16 +21,7 @@ port = {{ ironic.api_port.cont }}
connection = mysql+pymysql://{{ ironic.db.username }}:{{ ironic.db.password }}@{{ address('mariadb', mariadb.port) }}/{{ ironic.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 = {{ ironic.username }}
password = {{ ironic.password }}
memcached_servers = {{ address('memcached', memcached.port) }}
{{ keystone_authtoken.keystone_authtoken(ironic.username, ironic.password) }}
[service_catalog]
auth_type = password

7
service/ironic-api.yaml
View File

@ -29,14 +29,15 @@ service:
- ironic.conf
- name: ironic-user-create
type: single
command: openstack user create --project service --password {{ ironic.password }} {{ ironic.username }}
command: openstack user create --domain {{ service_account.domain }} --password {{ ironic.password }} {{ ironic.username }}
dependencies:
- keystone-create-project
- keystone-create-domain
- name: ironic-role-add
dependencies:
- ironic-user-create
- keystone-create-project
type: single
command: openstack role add --project service --user {{ ironic.username }} admin
command: openstack role add --project {{ service_account.project }} --user {{ ironic.username }} admin
- name: ironic-service-create
dependencies:
- keystone