openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix Ironic configuration for IPv6"

Browse Source
This commit is contained in:
Zuul 2019-10-01 17:08:26 +00:00 committed by Gerrit Code Review
commit 2b745412c4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/ironic/ironic-conductor-container-puppet.yaml
View File

@ -232,6 +232,10 @@ parameters:
default: []
description: List of additional architectures to enable.
type: comma_delimited_list
IronicIpVersion:
default: 4
description: The IP version that will be used for PXE booting.
type: string
conditions:
default_deploy_interface_unset: {equals : [{get_param: IronicDefaultDeployInterface}, '']}
@ -306,7 +310,7 @@ outputs:
ironic_conductor_http_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
"%{hiera('$NETWORK_uri')}"
params:
$NETWORK: {get_param: [ServiceNetMap, IronicNetwork]}
ironic::conductor::http_url:
@ -317,6 +321,7 @@ outputs:
- {get_param: IronicIPXEPort}
ironic::drivers::pxe::ipxe_enabled: {get_param: IronicIPXEEnabled}
ironic::drivers::pxe::ipxe_timeout: {get_param: IronicIPXETimeout}
ironic::drivers::pxe::ip_version: {get_param: IronicIpVersion}
# NOTE: bind IP is found in hiera replacing the network name with the
# local node IP for the given network; replacement examples
# (eg. for internal_api):