Skip to content

Commit cab94ce

Browse files
mtomaskamtomaska
committed
bgp_dt05 kustomize values
1 parent e269481 commit cab94ce

13 files changed

Lines changed: 328 additions & 9 deletions

File tree

‎playbooks/bgp/prepare-bgp-spines-leaves.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,10 @@
188188
hosts: "{{ router_bool | default(false) | ternary('routers', 'localhost') }}"
189189
vars:
190190
_ip_version: "{{ ip_version | default(4) | int }}"
191+
# Overridable via extra_vars (see playbook header).
192+
cifmw_bgp_router_asn: 65000
193+
cifmw_bgp_router_downlink_remote_as: internal
194+
cifmw_bgp_router_uplink_remote_as: external
191195
tasks:
192196
- name: Early end if no router defined
193197
ansible.builtin.meta: end_play
@@ -347,6 +351,10 @@
347351
hosts: spines
348352
vars:
349353
_ip_version: "{{ ip_version | default(4) | int }}"
354+
# Overridable via extra_vars (see playbook header).
355+
cifmw_bgp_spine_asn: 65000
356+
cifmw_bgp_spine_downlink_remote_as: external
357+
cifmw_bgp_spine_uplink_remote_as: internal
350358
tasks:
351359
- name: Obtain the connection for the eth0 interface
352360
ansible.builtin.command:
@@ -440,6 +448,10 @@
440448
leaf_id: "{{ (ansible_hostname.split('-')[-1] | int) % 2 }}" # always 2 leaves per rack
441449
rack_id: "{{ (ansible_hostname.split('-')[-1] | int) // 2 }}" # always 2 leaves per rack
442450
_ip_version: "{{ ip_version | default(4) | int }}"
451+
# Overridable via extra_vars (see playbook header).
452+
cifmw_bgp_leaf_asn: 64999
453+
cifmw_bgp_leaf_downlink_remote_as: internal
454+
cifmw_bgp_leaf_uplink_remote_as: external
443455
tasks:
444456
- name: Obtain the connection for the eth0 interface
445457
ansible.builtin.command:

‎playbooks/bgp/templates/leaf-frr.conf.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ debug bgp neighbor-events
1313
debug bgp updates
1414
debug bgp update-groups
1515

16-
router bgp 64999
16+
router bgp {{ cifmw_bgp_leaf_asn | default(64999) }}
1717
{% if _router_id %}
1818
bgp router-id {{_router_id}}
1919
{% endif %}
@@ -27,7 +27,7 @@ router bgp 64999
2727
! bgp long-lived-graceful-restart stale-time 15
2828

2929
neighbor downlink peer-group
30-
neighbor downlink remote-as internal
30+
neighbor downlink remote-as {{ cifmw_bgp_leaf_downlink_remote_as | default('internal') }}
3131
neighbor downlink bfd
3232
neighbor downlink bfd profile tripleo
3333
{# TODO: remove the next if when RHEL-63205 is fixed #}
@@ -43,7 +43,7 @@ router bgp 64999
4343
{% endfor %}
4444

4545
neighbor uplink peer-group
46-
neighbor uplink remote-as external
46+
neighbor uplink remote-as {{ cifmw_bgp_leaf_uplink_remote_as | default('external') }}
4747
neighbor uplink bfd
4848
neighbor uplink bfd profile tripleo
4949
! neighbor uplink capability extended-nexthop

‎playbooks/bgp/templates/router-frr.conf.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ debug bgp neighbor-events
1313
debug bgp updates
1414
debug bgp update-groups
1515

16-
router bgp 65000
16+
router bgp {{ cifmw_bgp_router_asn | default(65000) }}
1717
{% if _router_id %}
1818
bgp router-id {{_router_id}}
1919
{% endif %}
2020
bgp log-neighbor-changes
2121
bgp graceful-shutdown
2222

2323
neighbor downlink peer-group
24-
neighbor downlink remote-as internal
24+
neighbor downlink remote-as {{ cifmw_bgp_router_downlink_remote_as | default('internal') }}
2525
neighbor downlink bfd
2626
! neighbor downlink capability extended-nexthop
2727
{% for iface in router_downlink_ifs %}
2828
neighbor {{iface}} interface peer-group downlink
2929
{% endfor %}
3030

3131
neighbor uplink peer-group
32-
neighbor uplink remote-as external
32+
neighbor uplink remote-as {{ cifmw_bgp_router_uplink_remote_as | default('external') }}
3333
neighbor uplink bfd
3434
! neighbor uplink capability extended-nexthop
3535
neighbor {{router_uplink_if}} interface peer-group uplink

‎playbooks/bgp/templates/spine-frr.conf.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ debug bgp neighbor-events
1313
debug bgp updates
1414
debug bgp update-groups
1515

16-
router bgp 65000
16+
router bgp {{ cifmw_bgp_spine_asn | default(65000) }}
1717
{% if _router_id %}
1818
bgp router-id {{_router_id}}
1919
{% endif %}
2020
bgp log-neighbor-changes
2121
bgp graceful-shutdown
2222

2323
neighbor downlink peer-group
24-
neighbor downlink remote-as external
24+
neighbor downlink remote-as {{ cifmw_bgp_spine_downlink_remote_as | default('external') }}
2525
neighbor downlink bfd
2626
neighbor downlink bfd profile tripleo
2727
! neighbor downlink capability extended-nexthop
@@ -31,7 +31,7 @@ router bgp 65000
3131

3232
{% if router_bool | default(false) %}
3333
neighbor uplink peer-group
34-
neighbor uplink remote-as internal
34+
neighbor uplink remote-as {{ cifmw_bgp_spine_uplink_remote_as | default('internal') }}
3535
neighbor uplink bfd
3636
neighbor uplink bfd profile tripleo
3737
! neighbor uplink capability extended-nexthop

‎roles/ci_gen_kustomize_values/templates/bgp_dt05/OWNERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# See the OWNERS docs at https://www.kubernetes.dev/docs/guide/owners/
2+
3+
approvers:
4+
- bgp-team
5+
6+
reviewers:
7+
- bgp-team

‎roles/ci_gen_kustomize_values/templates/bgp_dt05/edpm-common-nodeset-values/common-bgp-edpm-values.yaml.j2‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# source: bgp_dt05/edpm-common-nodeset-values/common-bgp-edpm-values.yaml.j2
2+
{% set instances_names = [] %}
3+
{% set rack = 'r' ~ rack_number %}
4+
{% for _inst in cifmw_networking_env_definition.instances.keys() %}
5+
{% if _inst.startswith('-'.join([rack, node_type])) %}
6+
{% set _ = instances_names.append(_inst) %}
7+
{% endif %}
8+
{% endfor %}
9+
data:
10+
ssh_keys:
11+
authorized: {{ cifmw_ci_gen_kustomize_values_ssh_authorizedkeys | b64encode }}
12+
private: {{ cifmw_ci_gen_kustomize_values_ssh_private_key | b64encode }}
13+
public: {{ cifmw_ci_gen_kustomize_values_ssh_public_key | b64encode }}
14+
nova:
15+
migration:
16+
ssh_keys:
17+
private: {{ cifmw_ci_gen_kustomize_values_migration_priv_key | b64encode }}
18+
public: {{ cifmw_ci_gen_kustomize_values_migration_pub_key | b64encode }}
19+
nodeset:
20+
ansible:
21+
ansibleUser: "zuul"
22+
ansibleVars:
23+
edpm_fips_mode: "{{ 'enabled' if cifmw_fips_enabled|default(false)|bool else 'check' }}"
24+
timesync_ntp_servers:
25+
- hostname: "{{ cifmw_ci_gen_kustomize_values_ntp_srv | default('pool.ntp.org') }}"
26+
edpm_sshd_allowed_ranges:
27+
{% set sshd_allowed_range = cifmw_ci_gen_kustomize_values_sshd_ranges | default([]) %}
28+
{% for rack in ['r0', 'r1', 'r2'] %}
29+
{% set _ = sshd_allowed_range.append(cifmw_networking_env_definition.networks['ctlplane' + rack].network_v4) %}
30+
{% endfor %}
31+
{% for range in sshd_allowed_range %}
32+
- "{{ range }}"
33+
{% endfor %}
34+
nodes:
35+
{% for instance in instances_names %}
36+
{{ instance }}:
37+
ansible:
38+
{% set ctlplane_rack = 'ctlplane' + rack %}
39+
ansibleHost: {{ cifmw_networking_env_definition.instances[instance].networks[ctlplane_rack].ip_v4 }}
40+
{% if original_content.data.nodeset.nodes['edpm-' ~ instance].ansible.ansibleVars is defined %}
41+
ansibleVars: {{ original_content.data.nodeset.nodes['edpm-' ~ instance].ansible.ansibleVars }}
42+
{% endif %}
43+
hostName: {{ instance }}
44+
networks:
45+
{% for net in cifmw_networking_env_definition.instances[instance].networks.keys() %}
46+
{% if 'storagemgmt' not in net %}
47+
- name: {{ net if net != ctlplane_rack else 'ctlplane' }}
48+
subnetName: {{ 'subnet1' if net != ctlplane_rack else 'subnet' ~ rack_number }}
49+
{% if 'ctlplane' in net %}
50+
defaultRoute: true
51+
fixedIP: {{ cifmw_networking_env_definition.instances[instance].networks[ctlplane_rack].ip_v4 }}
52+
{% endif %}
53+
{% endif %}
54+
{% endfor %}
55+
{% set peer_suffix = 1 if 'compute' in instance else 5 %}
56+
- name: BgpNet0
57+
subnetName: subnet{{ rack_number }}
58+
fixedIP: 100.64.{{ rack_number }}.{{ peer_suffix + 1 }}
59+
- name: BgpNet1
60+
subnetName: subnet{{ rack_number }}
61+
fixedIP: 100.65.{{ rack_number }}.{{ peer_suffix + 1 }}
62+
- name: BgpMainNet
63+
subnetName: subnet{{ rack_number }}
64+
fixedIP: 99.99.{{ rack_number }}.{{ peer_suffix + 1 }}
65+
- name: BgpMainNetV6
66+
subnetName: subnet{{ rack_number }}
67+
fixedIP: f00d:f00d:f00d:f00d:f00d:f00d:f00d:00{{ (rack_number | int) + 1 }}{{ 2 if 'compute' in instance else 3 }}
68+
{% endfor %}

‎roles/ci_gen_kustomize_values/templates/bgp_dt05/edpm-r0-compute-nodeset-values/values.yaml.j2‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
# source: bgp_dt05/edpm-r0-compute-nodeset-values/values.yaml.j2
3+
{% set node_type = "compute" %}
4+
{% set rack_number = 0 %}
5+
{% include 'templates/bgp_dt05/edpm-common-nodeset-values/common-bgp-edpm-values.yaml.j2' %}

‎roles/ci_gen_kustomize_values/templates/bgp_dt05/edpm-r0-networker-nodeset-values/values.yaml.j2‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
# source: bgp_dt05/edpm-r0-networker-nodeset-values/values.yaml.j2
3+
{% set node_type = "networker" %}
4+
{% set rack_number = 0 %}
5+
{% include 'templates/bgp_dt05/edpm-common-nodeset-values/common-bgp-edpm-values.yaml.j2' %}

‎roles/ci_gen_kustomize_values/templates/bgp_dt05/edpm-r1-compute-nodeset-values/values.yaml.j2‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
# source: bgp_dt05/edpm-r1-compute-nodeset-values/values.yaml.j2
3+
{% set node_type = "compute" %}
4+
{% set rack_number = 1 %}
5+
{% include 'templates/bgp_dt05/edpm-common-nodeset-values/common-bgp-edpm-values.yaml.j2' %}

‎roles/ci_gen_kustomize_values/templates/bgp_dt05/edpm-r1-networker-nodeset-values/values.yaml.j2‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
# source: bgp_dt05/edpm-r1-networker-nodeset-values/values.yaml.j2
3+
{% set node_type = "networker" %}
4+
{% set rack_number = 1 %}
5+
{% include 'templates/bgp_dt05/edpm-common-nodeset-values/common-bgp-edpm-values.yaml.j2' %}

0 commit comments

Comments
 (0)