openstack/bifrost
Code Issues Proposed changes

Cleanup minor variable redefinition

Browse Source 
Attempting to support a context where network_interface may
be replaced, the variable redefinition appears to not handle
the possibility well, and as a result fails.

Replaced previously constructed variable with the string
replacement on each additional variable that is generated
for execution.

Change-Id: I6876298e28b6ceea2e226cda7e77317acc05d95c
This commit is contained in:
Julia Kreger 2017-04-02 04:41:40 +00:00
parent a1d0bf1e11
commit c4e6afae2c
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbooks/roles/ironic-enroll-dynamic/defaults/main.yml
View File

@ -3,7 +3,6 @@ ironic_url: "http://localhost:6385/"
file_url_port: "8080"
# Default network interface that bifrost will be attached to.
network_interface: "virbr0"
ans_network_interface: "{{ network_interface | replace('-', '_') }}"
# Normally this would setting would be http in a bifrost installation
# without TLS. This setting allows a user to override the setting in case
@ -12,7 +11,7 @@ ans_network_interface: "{{ network_interface | replace('-', '_') }}"
# documentation at http://ipxe.org/crypto
ipa_file_protocol: "http"
ipa_kernel_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.vmlinuz"
ipa_ramdisk_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.initramfs"
ipa_kernel_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + network_interface | replace('-', '_')]['ipv4']['address'] }}:{{file_url_port}}/ipa.vmlinuz"
ipa_ramdisk_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + network_interface | replace('-', '_')]['ipv4']['address'] }}:{{file_url_port}}/ipa.initramfs"
noauth_mode: true