Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure Ceph RGW with a object storage network #2301

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Configure Ceph RGW with a object storage network #2301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 87 additions & 0 deletions ci/playbooks/files/networking-env-definition.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,15 @@ instances:
parent_interface: eth1
skip_nm: false
vlan_id: 22
swift:
interface_name: eth1.25
ip_v4: 172.22.0.100
mac_addr: '52:54:00:0b:1c:e7'
mtu: 1500
network_name: swift
parent_interface: eth1
skip_nm: false
vlan_id: 25
compute-1:
hostname: compute-1
name: compute-1
Expand Down Expand Up @@ -189,6 +198,15 @@ instances:
parent_interface: eth1
skip_nm: false
vlan_id: 22
swift:
interface_name: eth1.25
ip_v4: 172.22.0.101
mac_addr: '52:54:00:0b:1c:e8'
mtu: 1500
network_name: swift
parent_interface: eth1
skip_nm: false
vlan_id: 25
compute-2:
hostname: compute-2
name: compute-2
Expand Down Expand Up @@ -227,6 +245,15 @@ instances:
parent_interface: eth1
skip_nm: false
vlan_id: 22
swift:
interface_name: eth1.25
ip_v4: 172.22.0.102
mac_addr: '52:54:00:0b:1c:e9'
mtu: 1500
network_name: swift
parent_interface: eth1
skip_nm: false
vlan_id: 25
controller-0:
hostname: controller-0
name: controller-0
Expand Down Expand Up @@ -336,6 +363,15 @@ instances:
parent_interface: enp6s0
skip_nm: false
vlan_id: 22
swift:
interface_name: enp6s0.25
ip_v4: 172.22.0.10
mac_addr: '52:54:00:18:a0:b6'
mtu: 1500
network_name: swift
parent_interface: enp6s0
skip_nm: false
vlan_id: 25
ocp-master-1:
hostname: ocp-master-1
name: ocp-master-1
Expand Down Expand Up @@ -374,6 +410,15 @@ instances:
parent_interface: enp6s0
skip_nm: false
vlan_id: 22
swift:
interface_name: enp6s0.25
ip_v4: 172.22.0.11
mac_addr: '52:54:00:18:a0:b7'
mtu: 1500
network_name: swift
parent_interface: enp6s0
skip_nm: false
vlan_id: 25
ocp-master-2:
hostname: ocp-master-2
name: ocp-master-2
Expand Down Expand Up @@ -412,6 +457,15 @@ instances:
parent_interface: enp6s0
skip_nm: false
vlan_id: 22
swift:
interface_name: enp6s0.25
ip_v4: 172.22.0.12
mac_addr: '52:54:00:18:a0:b8'
mtu: 1500
network_name: swift
parent_interface: enp6s0
skip_nm: false
vlan_id: 25
networks:
ctlplane:
dns_v4:
Expand Down Expand Up @@ -598,3 +652,36 @@ networks:
start_host: 100
ipv6_ranges: []
vlan_id: 22
swift:
dns_v4: []
dns_v6: []
mtu: 1496
network_name: swift
network_v4: 172.22.0.0/24
search_domain: swift.example.com
tools:
metallb:
ipv4_ranges:
- end: 172.22.0.90
end_host: 90
length: 11
start: 172.22.0.80
start_host: 80
ipv6_ranges: []
multus:
ipv4_ranges:
- end: 172.22.0.70
end_host: 70
length: 41
start: 172.22.0.30
start_host: 30
ipv6_ranges: []
netconfig:
ipv4_ranges:
- end: 172.22.0.250
end_host: 250
length: 151
start: 172.22.0.100
start_host: 100
ipv6_ranges: []
vlan_id: 25
24 changes: 20 additions & 4 deletions playbooks/ceph.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,27 +338,43 @@
# public network always exist because is provided by the ceph_spec role
- name: Get Storage network range
ansible.builtin.set_fact:
cifmw_cephadm_rgw_network: "{{ lookup('ansible.builtin.ini', 'public_network section=global file=' ~ cifmw_cephadm_bootstrap_conf) }}"
cifmw_cephadm_storage_network: "{{ lookup('ansible.builtin.ini', 'public_network section=global file=' ~ cifmw_cephadm_bootstrap_conf) }}"

- name: Set RGW network range to storage network only if it was not provided
ansible.builtin.set_fact:
cifmw_cephadm_rgw_network: "{{ cifmw_cephadm_storage_network }}"
when:
- cifmw_cephadm_rgw_network is not defined or
cifmw_cephadm_rgw_network | length == 0

- name: Set IP address of first monitor
ansible.builtin.set_fact:
cifmw_cephadm_first_mon_ip: "{{ hostvars[this_host][all_addresses] | ansible.utils.ipaddr(cifmw_cephadm_rgw_network) | first }}"
cifmw_cephadm_first_mon_ip: "{{ hostvars[this_host][all_addresses] | ansible.utils.ipaddr(cifmw_cephadm_storage_network) | first }}"
vars:
this_host: "{{ _target_hosts | first }}"

- name: Assert if any EDPM nodes n/w interface is missing in storage network
ansible.builtin.assert:
that:
- hostvars[item][all_addresses] | ansible.utils.ipaddr(cifmw_cephadm_storage_network) | length > 0
fail_msg: "node {{ item }} doesn't have any interface connected to network {{ cifmw_cephadm_storage_network }}"
loop: "{{ _target_hosts }}"

- name: Assert if any EDPM nodes n/w interface is missing in RGW network
ansible.builtin.assert:
that:
- hostvars[item][all_addresses] | ansible.utils.ipaddr(cifmw_cephadm_rgw_network) | length > 0
fail_msg: "node {{ item }} doesn't have any interface connected to network {{ cifmw_cephadm_rgw_network }}"
loop: "{{ _target_hosts }}"
when:
- cifmw_cephadm_rgw_network != cifmw_cephadm_storage_network

- name: Get already assigned IP addresses
- name: Get already assigned RGW IP addresses
ansible.builtin.set_fact:
ips: "{{ ips | default([]) + [ hostvars[item][all_addresses] | ansible.utils.ipaddr(cifmw_cephadm_rgw_network) | first ] }}"
loop: "{{ _target_hosts }}"

# cifmw_cephadm_vip is the VIP reserved in the Storage network
# cifmw_cephadm_vip is the VIP reserved in the RGW network
- name: Set VIP var as empty string
ansible.builtin.set_fact:
cifmw_cephadm_vip: ""
Expand Down
2 changes: 1 addition & 1 deletion roles/cifmw_cephadm/tasks/check_vip.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
ansible.builtin.set_fact:
count: "{{ 2 if count is undefined else count | int + 2 }}"

- name: Get an IP address from the Storage network
- name: Get an IP address from the RGW network
ansible.builtin.set_fact:
cur_ip: "{{ cifmw_cephadm_rgw_network | ansible.utils.next_nth_usable(count) }}"

Expand Down
17 changes: 17 additions & 0 deletions scenarios/reproducers/networking-definition.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,19 @@ cifmw_networking_definition:
end: 250
vlan: 23
mtu: 1500
swift:
network: "172.22.0.0/24"
tools:
netconfig:
ranges:
- start: 100
end: 250
multus:
ranges:
- start: 30
end: 70
vlan: 25
mtu: 1500

group-templates:
ocps:
Expand All @@ -106,6 +119,8 @@ cifmw_networking_definition:
trunk-parent: ctlplane
storage:
trunk-parent: ctlplane
swift:
trunk-parent: ctlplane
ocp_workers:
network-template:
range:
Expand All @@ -127,6 +142,8 @@ cifmw_networking_definition:
trunk-parent: ctlplane
storagemgmt:
trunk-parent: ctlplane
swift:
trunk-parent: ctlplane
cephs:
network-template:
range:
Expand Down