From 4ea53eccc5a2e96baa1b3896ce08e57b71a05977 Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Thu, 7 Mar 2024 16:51:55 +0000 Subject: [PATCH] Add back ansibleVars while other repositories don't have the `ansibleVarsFrom` feature, we need these vars back Signed-off-by: Fabricio Aguiar --- .../base/crs/openstackdataplanenodeset.yaml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/examples/base/crs/openstackdataplanenodeset.yaml b/examples/base/crs/openstackdataplanenodeset.yaml index d86bdf830..857cd2048 100644 --- a/examples/base/crs/openstackdataplanenodeset.yaml +++ b/examples/base/crs/openstackdataplanenodeset.yaml @@ -63,6 +63,44 @@ spec: # edpm_bootstrap_command: | # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} # podman login -u {{ registry_username }} -p {{ registry_password }} registry.redhat.io + edpm_network_config_template: | + --- + {% set mtu_list = [ctlplane_mtu] %} + {% for network in role_networks %} + {{ mtu_list.append(lookup('vars', networks_lower[network] ~ '_mtu')) }} + {%- endfor %} + {% set min_viable_mtu = mtu_list | max %} + network_config: + - type: ovs_bridge + name: {{ neutron_physical_bridge_name }} + mtu: {{ min_viable_mtu }} + use_dhcp: false + dns_servers: {{ ctlplane_dns_nameservers }} + domain: {{ dns_search_domains }} + addresses: + - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }} + routes: {{ ctlplane_host_routes }} + members: + - type: interface + name: nic1 + mtu: {{ min_viable_mtu }} + # force the MAC address of the bridge to this interface + primary: true + {% for network in role_networks %} + - type: vlan + mtu: {{ lookup('vars', networks_lower[network] ~ '_mtu') }} + vlan_id: {{ lookup('vars', networks_lower[network] ~ '_vlan_id') }} + addresses: + - ip_netmask: + {{ lookup('vars', networks_lower[network] ~ '_ip') }}/{{ lookup('vars', networks_lower[network] ~ '_cidr') }} + routes: {{ lookup('vars', networks_lower[network] ~ '_host_routes') }} + {% endfor %} + + # These vars are for the network config templates themselves and are + # considered EDPM network defaults. + neutron_physical_bridge_name: br-ex + neutron_public_interface_name: eth0 + # edpm_nodes_validation edpm_nodes_validation_validate_controllers_icmp: false edpm_nodes_validation_validate_gateway_icmp: false gather_facts: false