openstack/bifrost
Code Issues Proposed changes

Merge "Add Keystone support to ironic.conf"

Browse Source
This commit is contained in:
Jenkins 2016-12-02 17:00:48 +00:00 committed by Gerrit Code Review
commit 7a8c5ee705
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
View File

@ -20,7 +20,11 @@ debug = false
rabbit_userid = ironic rabbit_userid = ironic
rabbit_password = {{ ironic_db_password }} rabbit_password = {{ ironic_db_password }}
{% if enable_keystone is defined and enable_keystone | bool == true %}
auth_strategy = keystone
{% else %}
auth_strategy = noauth auth_strategy = noauth
{% endif %}
[pxe] [pxe]
pxe_append_params = systemd.journald.forward_to_console=yes {{ extra_kernel_options | default('') }} pxe_append_params = systemd.journald.forward_to_console=yes {{ extra_kernel_options | default('') }}
@ -64,3 +68,23 @@ use_web_server_for_images = true
[inspector] [inspector]
enabled = true enabled = true
{% endif %} {% endif %}
{% if enable_keystone is defined and enable_keystone | bool == true %}
[keystone]
region_name = {{ keystone.bootstrap.region_name | default('RegionOne')}}
[keystone_authtoken]
auth_plugin = password
auth_url = {{ ironic.service_catalog.auth_url }}
username = {{ ironic.service_catalog.username }}
password = {{ ironic.service_catalog.password }}
user_domain_id = default
project_name = {{ ironic.service_catalog.project_name }}
project_domain_id = default
[service_catalog]
auth_url = {{ ironic.service_catalog.auth_url }}
auth_type = password
tenant_name = {{ ironic.service_catalog.project_name }}
username = {{ ironic.service_catalog.username }}
password = {{ ironic.service_catalog.password }}
{% endif %}