openstack/bifrost
Code Issues Proposed changes

Merge "Allow to specify the public IP to be used for public endpoints"

Browse Source
This commit is contained in:
Zuul 2018-10-05 15:10:07 +00:00 committed by Gerrit Code Review
commit b91887883d
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-ironic-install/tasks/keystone_setup.yml
View File

@ -170,7 +170,7 @@
- name: "Setting external Ironic public URL" - name: "Setting external Ironic public URL"
set_fact: set_fact:
ironic_public_url: "{{ ironic.keystone.public_url | default('http://127.0.0.1:6385/') | replace('127.0.0.1', hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address']) }}" ironic_public_url: "{{ ironic.keystone.public_url | default('http://127.0.0.1:6385/') | replace('127.0.0.1', public_ip | default(hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'])) }}"
when: use_public_urls | default(false) | bool when: use_public_urls | default(false) | bool
- name: "Create ironic public endpoint" - name: "Create ironic public endpoint"

2
playbooks/roles/bifrost-ironic-install/tasks/keystone_setup_inspector.yml
View File

@ -149,7 +149,7 @@
- name: "Setting external ironic-inspector public URL" - name: "Setting external ironic-inspector public URL"
set_fact: set_fact:
ironic_inspector_public_url: "{{ ironic_inspector.keystone.public_url | default('http://127.0.0.1:5050/') | replace('127.0.0.1', hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address']) }}" ironic_inspector_public_url: "{{ ironic_inspector.keystone.public_url | default('http://127.0.0.1:5050/') | replace('127.0.0.1', public_ip | default(hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'])) }}"
when: use_public_urls | default(false) | bool when: use_public_urls | default(false) | bool
# NOTE(TheJulia): This seems like something that should be # NOTE(TheJulia): This seems like something that should be

2
playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml
View File

@ -170,7 +170,7 @@
- name: "Setting external Keystone public URL" - name: "Setting external Keystone public URL"
set_fact: set_fact:
keystone_public_url: "{{ keystone.bootstrap.public_url | replace('127.0.0.1', hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address']) }}" keystone_public_url: "{{ keystone.bootstrap.public_url | replace('127.0.0.1', public_ip | default(hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'])) }}"
when: use_public_urls | default(false) | bool when: use_public_urls | default(false) | bool
- name: "Setting internal Keystone URL" - name: "Setting internal Keystone URL"

13
releasenotes/notes/allow-custom-public-endpoints-ip-4662c246f029589e.yaml Normal file
View File

@ -0,0 +1,13 @@
---
features:
- |
By adding extra string variable ``-e public_ip=8.8.8.8``
which is to be used in conjunction with ``use_public_urls=true``
Bifrost, if used with Keystone enabled, will configure
public services endpoints (for Keystone, Ironic and Ironic
Inspector) to contain this public IP address in replacement
of the default values which are set to point to localhost.
The default behaviour is kept unchanged, which means that
services public endpoints will contain references to
localhost aka 127.0.0.1.