openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Fix keystone and neutron URL

Browse Source
This commit is contained in:
Michael Davies 2016-01-19 21:55:45 +00:00
parent adf87cec93
commit 30e34e89a1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -53,8 +53,7 @@ ironic_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(ir
ironic_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(ironic_service_proto) }}"
ironic_service_port: 6385
ironic_service_description: "Ironic baremetal provisioning service"
#ironic_service_publicuri: "{{ ironic_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ ironic_service_port }}"
ironic_service_publicuri: "{{ ironic_service_publicuri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}"
ironic_service_publicuri: "{{ ironic_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ ironic_service_port }}"
ironic_service_publicurl: "{{ ironic_service_publicuri }}"
ironic_service_adminuri: "{{ ironic_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ ironic_service_port }}"
ironic_service_adminurl: "{{ ironic_service_adminuri }}"

4
templates/ironic.conf.j2
View File

@ -1232,7 +1232,7 @@ auth_strategy={{ ironic_auth_strategy }}
#
# Complete public Identity API endpoint. (string value)
#auth_uri=<None>
auth_uri={{ keystone_service_internaluri }}
# API version of the admin Identity API endpoint. (string
# value)
@ -1432,7 +1432,7 @@ admin_tenant_name={{ ironic_service_project_name }}
#
# URL for connecting to neutron. (string value)
url={{ neutron_service_publicuri }}
url={{ neutron_service_adminurl }}
# Timeout value for connecting to neutron in seconds. (integer
# value)