Skip to content

Commit bc59b9e

Browse files
eduolivareseduolivares
committed
Add bgp-l3-xl-adoption job
1 parent a57402f commit bc59b9e

File tree

12 files changed

+1422
-4
lines changed

12 files changed

+1422
-4
lines changed

‎roles/adoption_osp_deploy/tasks/config_files.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,15 @@
3434
register: _original_config_download
3535
delegate_to: "localhost"
3636

37+
- name: Copy config download file as is (bgp)
38+
when: bgp
39+
delegate_to: "osp-undercloud-0"
40+
copy:
41+
content: "{{ _original_config_download['content'] |b64decode | from_yaml | to_nice_yaml(indent=2, sort_keys=false) }}"
42+
dest: /home/zuul/config_download_overcloud.yaml
43+
3744
- name: Generate config download file
45+
when: not bgp
3846
vars:
3947
_ctlplane_net: "{{ cifmw_networking_env_definition.networks.ctlplane }}"
4048
_hostname_map_translation: >-

‎roles/adoption_osp_deploy/tasks/generate_adoption_vars.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
- user_dir
2323

2424
- name: Generate adoption vars file
25+
when: not bgp
2526
delegate_to: "controller-0"
2627
vars:
2728
_undercloud_name: "{{ _vm_groups['osp-underclouds'] | first }}"
@@ -44,3 +45,22 @@
4445
src: "adoption_vars.yaml.j2"
4546
dest: "{{ ansible_user_dir }}/adoption_vars.yaml"
4647
mode: "0644"
48+
49+
50+
- name: Generate adoption vars file (BGP)
51+
when: bgp
52+
delegate_to: "controller-0"
53+
vars:
54+
_undercloud_name: "{{ _vm_groups['osp-underclouds'] | first }}"
55+
_undercloud_net: "{{ cifmw_networking_env_definition.instances[_undercloud_name] }}"
56+
_undercloud_ip: "{{ _undercloud_net.networks.ctlplaner0[ip_version|default('ip_v4')] }}"
57+
_controller_1_name: "{{ _vm_groups['osp-r0-controllers'] | first }}"
58+
_controller_1_net: "{{ cifmw_networking_env_definition.instances[_controller_1_name] }}"
59+
_controller_1_internalapi_ip: "99.99.0.29"
60+
_compute_1_name: "{{ _vm_groups['osp-r0-computes'] | first }}"
61+
_compute_1_net: "{{ cifmw_networking_env_definition.instances[_compute_1_name] }}"
62+
_compute_1_ip: "{{ _compute_1_net.networks.ctlplaner0[ip_version|default('ip_v4')] }}"
63+
ansible.builtin.template:
64+
src: "adoption_vars_bgp.yaml.j2"
65+
dest: "{{ ansible_user_dir }}/adoption_vars.yaml"
66+
mode: "0644"

‎roles/adoption_osp_deploy/tasks/prepare_overcloud.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,21 @@
137137
script: "{{ _source_cmd }}; {{ _vip_provision_cmd }}"
138138

139139
- name: Create tripleo ansible inventory
140+
when: not bgp
140141
delegate_to: "osp-undercloud-0"
141142
ansible.builtin.template:
142143
src: "tripleo-ansible-inventory.yaml.j2"
143144
dest: "{{ ansible_user_dir }}/overcloud-deploy/{{ _overcloud_name }}/tripleo-ansible-inventory.yaml"
144145
mode: "0644"
145146

147+
- name: Create tripleo ansible inventory (BGP)
148+
when: bgp
149+
delegate_to: "osp-undercloud-0"
150+
ansible.builtin.template:
151+
src: "tripleo-ansible-inventory_bgp.yaml.j2"
152+
dest: "{{ ansible_user_dir }}/overcloud-deploy/{{ _overcloud_name }}/tripleo-ansible-inventory.yaml"
153+
mode: "0644"
154+
146155
- name: Ensure os-net-config and openvswitch is installed in overcloud nodes
147156
become: true
148157
delegate_to: "{{ overcloud_vm }}"
@@ -184,6 +193,78 @@
184193
loop: "{{ _tripleo_nodes_stack[_overcloud_name] }}"
185194
loop_control:
186195
loop_var: overcloud_vm
196+
when: not bgp
197+
198+
- name: Generate os-net-config file for overcloud nodes (bgp)
199+
become: true
200+
delegate_to: "{{ overcloud_vm }}"
201+
vars:
202+
_node_net: "{{ cifmw_networking_env_definition.instances[overcloud_vm] }}"
203+
_dns_server: "{{ _ctlplane_net.[dns_version|default('dns_v4')] }}"
204+
_interface_mtu: 1500
205+
vms:
206+
osp-r0-compute-0:
207+
ctlplane: '192.168.122.100'
208+
left: '100.64.0.2'
209+
right: '100.65.0.2'
210+
main: '99.99.0.2'
211+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0004'
212+
osp-r0-compute-1:
213+
ctlplane: '192.168.122.101'
214+
left: '100.64.0.6'
215+
right: '100.65.0.6'
216+
main: '99.99.0.6'
217+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0005'
218+
osp-r1-compute-0:
219+
ctlplane: '192.168.123.105'
220+
left: '100.64.1.2'
221+
right: '100.65.1.2'
222+
main: '99.99.1.2'
223+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0006'
224+
osp-r1-compute-1:
225+
ctlplane: '192.168.123.106'
226+
left: '100.64.1.6'
227+
right: '100.65.1.6'
228+
main: '99.99.1.6'
229+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0007'
230+
osp-r2-compute-0:
231+
ctlplane: '192.168.124.110'
232+
left: '100.64.2.2'
233+
right: '100.65.2.2'
234+
main: '99.99.2.2'
235+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0008'
236+
osp-r2-compute-1:
237+
ctlplane: '192.168.124.111'
238+
left: '100.64.2.6'
239+
right: '100.65.2.6'
240+
main: '99.99.2.6'
241+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0009'
242+
osp-r0-controller-0:
243+
ctlplane: '192.168.122.140'
244+
left: '100.64.0.30'
245+
right: '100.65.0.30'
246+
main: '99.99.0.29'
247+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0001'
248+
osp-r1-controller-0:
249+
ctlplane: '192.168.123.142'
250+
left: '100.64.1.30'
251+
right: '100.65.1.30'
252+
main: '99.99.1.29'
253+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0002'
254+
osp-r2-controller-0:
255+
ctlplane: '192.168.124.144'
256+
left: '100.64.2.30'
257+
right: '100.65.2.30'
258+
main: '99.99.2.29'
259+
main6: 'f00d:f00d:f00d:f00d:f00d:f00d:f00d:0003'
260+
ansible.builtin.template:
261+
src: "os_net_config_overcloud_bgp.yml.j2"
262+
dest: /etc/os-net-config/tripleo_config.yaml
263+
mode: "0644"
264+
loop: "{{ _tripleo_nodes_stack }}"
265+
loop_control:
266+
loop_var: overcloud_vm
267+
when: bgp
187268

188269
- name: Configure network interfaces for overcloud nodes
189270
become: true

‎roles/adoption_osp_deploy/tasks/prepare_undercloud.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
mode: '0755'
9797

9898
- name: Generate os-net-config file
99+
when: not bgp
99100
become: true
100101
vars:
101102
_undercloud_name: "{{ _vm_groups['osp-underclouds'] | first }}"
@@ -112,6 +113,24 @@
112113
dest: /etc/os-net-config/tripleo_config.yaml
113114
mode: "0644"
114115

116+
- name: Generate os-net-config file (bgp)
117+
when: bgp
118+
become: true
119+
vars:
120+
_undercloud_name: "{{ _vm_groups['osp-underclouds'] | first }}"
121+
_undercloud_net: "{{ cifmw_networking_env_definition.instances[_undercloud_name] }}"
122+
_ctlplane_ip: "{{ _undercloud_net.networks.ctlplaner0[ip_version|default('ip_v4')] }}"
123+
_ctlplane_vip: "{{ cifmw_adoption_osp_deploy_scenario.undercloud.ctlplane_vip }}"
124+
_ctlplane_net: "{{ cifmw_networking_env_definition.networks.ctlplaner0}}"
125+
_dns_server: "{{ _ctlplane_net[dns_version|default('dns_v4')] }}"
126+
_gateway_ip: "{{ _ctlplane_net[gw_version|default('gw_v4')] }}"
127+
_interface_mtu: "{{ _undercloud_net.networks.ctlplaner0.mtu }}"
128+
_ctlplane_cidr: "{{ _undercloud_net.networks.ctlplaner0[prefix_length_version|default('prefix_length_v4')] }}"
129+
ansible.builtin.template:
130+
src: "os_net_config_undercloud_bgp.yml.j2"
131+
dest: /etc/os-net-config/tripleo_config.yaml
132+
mode: "0644"
133+
115134
- name: Copy undercloud.conf file to location to edit it
116135
ansible.builtin.copy:
117136
src: "/usr/share/python-tripleoclient/undercloud.conf.sample"
@@ -120,6 +139,7 @@
120139
mode: "0644"
121140

122141
- name: Add environment specific vars for undercloud
142+
when: not bgp
123143
vars:
124144
_undercloud_name: "{{ _vm_groups['osp-underclouds'] | first }}"
125145
_undercloud_net: "{{ cifmw_networking_env_definition.instances[_undercloud_name] }}"
@@ -175,6 +195,35 @@
175195
combine(_env_undercloud, recursive=true, list_merge="append_rp")
176196
}}
177197
198+
- name: Add environment specific vars for undercloud (bgp)
199+
when: bgp
200+
vars:
201+
_undercloud_name: "{{ _vm_groups['osp-underclouds'] | first }}"
202+
_undercloud_net: "{{ cifmw_networking_env_definition.instances[_undercloud_name] }}"
203+
_undercloud_ip: "{{ _undercloud_net.networks.ctlplaner0[ip_version|default('ip_v4')] }}"
204+
_undercloud_net_prefix: "{{ _undercloud_net.networks.ctlplaner0[prefix_length_version|default('prefix_length_v4')] }}"
205+
_ctlplane_cidr: "{{ cifmw_networking_env_definition.networks.ctlplaner0[network_version|default('network_v4')] }}"
206+
_interface_mtu: "{{ _undercloud_net.networks.ctlplaner0.mtu }}"
207+
_env_undercloud:
208+
config:
209+
- section: DEFAULT
210+
option: undercloud_ntp_servers
211+
value: "{{ cifmw_adoption_osp_deploy_ntp_server }}"
212+
- section: DEFAULT
213+
option: container_images_file
214+
value: "{{ ansible_user_dir }}/containers-prepare-parameters.yaml"
215+
- section: DEFAULT
216+
option: net_config_override
217+
value: "/etc/os-net-config/tripleo_config.yaml"
218+
ansible.builtin.set_fact:
219+
_undercloud_conf: >-
220+
{{
221+
cifmw_adoption_osp_deploy_scenario.undercloud |
222+
combine(_env_undercloud, recursive=true, list_merge="append_rp")
223+
}}
224+
225+
226+
178227
- name: Copy undercloud overrides file if present and amend undercloud conf
179228
when: cifmw_adoption_osp_deploy_scenario.undercloud.undercloud_parameters_override is defined
180229
vars:

0 commit comments

Comments
 (0)