Skip to content

Commit 146d9a8

Browse files
evallespevallesp
committed
DNM: Make worker-Nodes take preference in nncp ci_kustomize
1 parent afcf42b commit 146d9a8

File tree

16 files changed

+63
-15
lines changed

16 files changed

+63
-15
lines changed

‎roles/ci_dcn_site/templates/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
{% set ns = namespace(interfaces={},
44
ocp_index=0,
55
lb_tools={}) %}
6+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
7+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
8+
69
data:
7-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
10+
{% for host in host_sorted_array -%}
811
{% for network in cifmw_networking_env_definition.instances[host]['networks'].values() -%}
912
{% set ns.interfaces = ns.interfaces |
1013
combine({network.network_name: (network.parent_interface |

‎roles/ci_gen_kustomize_values/templates/bgp-l3-xl/network-values/values.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
{% set ns = namespace(interfaces={},
44
ocp_index=0,
55
lb_tools={}) %}
6+
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
610
data:
7-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
812
{% set hostname = cifmw_networking_env_definition.instances[host]['hostname'] %}
913
{% if host is match('^(ocp|crc).*') %}
1014
node_{{ ns.ocp_index }}:

‎roles/ci_gen_kustomize_values/templates/bgp_dt01/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
{% set ns = namespace(interfaces={},
44
ocp_index=0,
55
lb_tools={}) %}
6+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
7+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
8+
69
data:
7-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
10+
{% for host in host_sorted_array -%}
811
{% set hostname = cifmw_networking_env_definition.instances[host]['hostname'] %}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:

‎roles/ci_gen_kustomize_values/templates/bmo01/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
# source: bmo01/network-values/values.yaml.j2
33
{% set _ipv = cifmw_ci_gen_kustomize_values_ip_version_var_mapping %}
44
{% set ns = namespace(ocp_index=0) %}
5+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
6+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
7+
58
data:
6-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
9+
{% for host in host_sorted_array -%}
710
{% if host is match('^(ocp|crc).*') %}
811
node_{{ ns.ocp_index }}:
912
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/common/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/dcn/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
{% set ns = namespace(interfaces={},
44
ocp_index=0,
55
lb_tools={}) %}
6+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
7+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
8+
69
data:
7-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
10+
{% for host in host_sorted_array -%}
811
{% for network in cifmw_networking_env_definition.instances[host]['networks'].values() -%}
912
{% set ns.interfaces = ns.interfaces |
1013
combine({network.network_name: (network.parent_interface |

‎roles/ci_gen_kustomize_values/templates/multi-namespace/network-values2/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/osasinfra-ipv6/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/shiftstack/network-values/values.yaml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
# source: shiftstack/network-values/values.yaml.j2
33
{% set ns = namespace(interfaces={}, ocp_index=0, lb_tools={}) %}
4+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
5+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
46

57
data:
68
{% for host in cifmw_networking_env_definition.instances.keys() -%}

‎roles/ci_gen_kustomize_values/templates/uni01alpha-adoption/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in chost_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/uni01alpha/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set =host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/uni04delta-ipv6-adoption/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/uni04delta-ipv6/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/uni05epsilon/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/uni06zeta/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

‎roles/ci_gen_kustomize_values/templates/uni07eta/network-values/values.yaml.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
{% set ns = namespace(interfaces={},
55
ocp_index=0,
66
lb_tools={}) %}
7+
{% set host_unsorted_array=cifmw_networking_env_definition.instances.keys() %}
8+
{% set host_sorted_array=host_unsorted_array.sort(reverse=True) %}
9+
710
data:
8-
{% for host in cifmw_networking_env_definition.instances.keys() -%}
11+
{% for host in host_sorted_array -%}
912
{% if host is match('^(ocp|crc).*') %}
1013
node_{{ ns.ocp_index }}:
1114
{% set ns.ocp_index = ns.ocp_index+1 %}

0 commit comments

Comments
 (0)