openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Move the masquerade override to parameter"

This commit is contained in:
Zuul 2022-04-28 11:17:04 +00:00 committed by Gerrit Code Review
parent a8dc75abe8 142ad66f32
commit 0fe3c5572f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/undercloud-deploy/templates/hieradata-overrides-t-h-t-undercloud.yaml.j2
View File

@ -10,11 +10,6 @@ parameter_defaults:
# the value of libvirt_uri into /etc/ironic/ironic.conf.
ironic::drivers::ssh::libvirt_uri: '{{libvirt_uri}}'
{% if ctlplane_masquerade|default(false) %}
# Override masquerading, OVB need's to masquerade the External (10.0.0.0/24) net as well.
tripleo::masquerade_networks::masquerade_networks: {% if overcloud_ipv6|bool %}{'{{ undercloud_network_cidr }}': ['{{ undercloud_network_cidr }}'], '{{ undercloud_external_network_cidr_ipv4 }}': ['{{ undercloud_external_network_cidr_ipv4}}']}{% else %}{'{{ undercloud_network_cidr }}': ['{{ undercloud_network_cidr }}'], '{{ undercloud_external_network_cidr }}': ['{{ undercloud_external_network_cidr}}']}{% endif -%}
{% endif %}
# The following are configurations for the different workers for the undercloud
# services.
{% if undercloud_workers is defined -%}

8
roles/undercloud-deploy/templates/undercloud-parameter-defaults.yaml.j2
View File

@ -16,4 +16,12 @@ resulting YAML is consumed, whereas with JSON all strings are quoted.
{% if undercloud_resource_registry_args is defined and undercloud_resource_registry_args %}
{% set _ = undercloud_parameter_defaults['resource_registry'].update(undercloud_resource_registry_args) %}
{% endif %}
{% if ctlplane_masquerade|default(false) %}
{% if overcloud_ipv6|bool %}
{% set masquerade_nets = {undercloud_network_cidr: [undercloud_network_cidr], undercloud_external_network_cidr_ipv4: [undercloud_external_network_cidr_ipv4]} %}
{% else %}
{% set masquerade_nets = {undercloud_network_cidr: [undercloud_network_cidr], undercloud_external_network_cidr: [undercloud_external_network_cidr]} %}
{% endif %}
{% set _ = undercloud_parameter_defaults['parameter_defaults'].update({'MasqueradeNetworks': masquerade_nets }) %}
{% endif %}
{{ undercloud_parameter_defaults | to_nice_json }}