Skip to content

Commit cfffce8

Browse files
committed
ironic_adoption: fix Jinja2 rendering
Jinja2 stripping whitespace/linebreak issue, the CR was rendered as: ``` customServiceConfig: | [DEFAULT] default_network_interface=neutron ironicAPI: replicas: 1 ``` Which cause invalid config, and ironic-conductor to never start. Jira: OSPRH-20021 Signed-off-by: Harald Jensås <hjensas@redhat.com>
1 parent 4f10546 commit cfffce8

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

  • tests/roles/ironic_adoption/defaults

tests/roles/ironic_adoption/defaults/main.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ ironic_patch: |
1616
databaseInstance: openstack
1717
customServiceConfig: |
1818
[DEFAULT]
19-
{% if ipv6_enabled | default(false) -%}
20-
default_network_interface=neutron
21-
{%- else -%}
22-
default_network_interface=flat
23-
{%- endif %}
19+
default_network_interface={{ 'neutron' if ipv6_enabled | default(false) else 'flat' }}
2420
ironicAPI:
2521
replicas: 1
2622
override:

0 commit comments

Comments
 (0)