Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Fix "ManageNetworks" use-case
Browse files Browse the repository at this point in the history
With change I603521bd00dc100e03c765c25503b5e01f3383e4
the ManageNetworks == False use case was overlooked.

When ManageNetworks is set to False and networks are
not created we need to build network_attrs and
subnet_attrs from the data present in network_data.yaml
and parameters.

The network_attrs and subnet_attrs was backported to
ussuri and train in change:
I3309f2a0e39ad115930ecd5c0e895816565819e9

osp-director-operator need this fix as it is using
manage_networks: false.

Conflicts:
    network/network.j2

Closes-Bug: #1920050
Change-Id: I98a3d582add0d6881cd39433ddb25515f0e0dc31
(cherry picked from commit 80b226c)
(cherry picked from commit d39526d)
(cherry picked from commit 3d4d75b)
  • Loading branch information
hjensas authored and stuggi committed Mar 11, 2022
1 parent c60ebf6 commit 497d3f6
Showing 1 changed file with 33 additions and 3 deletions.
36 changes: 33 additions & 3 deletions network/network.j2
Expand Up @@ -258,11 +258,41 @@ outputs:
{%- endfor %}
network_attrs:
description: {{network.name}} network's attributes
value: {get_attr: [{{network.name}}Network]}
value:
if:
- manage_networks
- {get_attr: [{{network.name}}Network, show]}
- name: {{network.name_lower}}
dns_domain:
list_join:
- '.'
- - {{network.name.lower()}}
- {get_param: CloudDomain}
- ''
mtu: {{network.mtu|default('1500')}}

subnet_attrs:
description: Map of attributes for subnets in the {{network.name}} network
value:
{{network.name_lower}}_subnet: {get_attr: [{{network.name}}Subnet]}
if:
- manage_networks
- {{network.name_lower}}_subnet: {get_attr: [{{network.name}}Subnet, show]}
{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
{{subnet}}: {get_attr: [{{network.name}}Subnet_{{subnet}}, show]}
{%- endfor %}
- {{network.name_lower}}_subnet:
name: {{network.name_lower}}_subnet
cidr: {get_param: {{network.name}}NetCidr}
dns_nameservers: []
gateway_ip: {get_param: {{network.name}}InterfaceDefaultRoute}
host_routes: {get_param: {{network.name}}Routes}
ip_version: {if: [is_ipv6, 6, 4]}
{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
{{subnet}}: {get_attr: [{{network.name}}Subnet_{{subnet}}]}
{{subnet}}:
name: {{subnet}}
cidr: {get_param: {{network.name}}SubnetCidr_{{subnet}}}
dns_nameservers: []
gateway_ip: {get_param: {{network.name}}InterfaceDefaultRoute_{{subnet}}}
host_routes: {get_param: {{network.name}}Routes_{{subnet}}}
ip_version: {if: [is_ipv6, 6, 4]}
{%- endfor %}

0 comments on commit 497d3f6

Please sign in to comment.