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.

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

Add NFS network for Manila to uni04delta #376

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
120 changes: 120 additions & 0 deletions automation/net-env/uni04delta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ instances:
prefix_length_v4: 24
skip_nm: false
vlan_id: 123
nfs:
interface_name: eth1.124
ip_v4: 172.21.0.111
mac_addr: '52:54:00:1b:1c:e5'
mtu: 1500
network_name: nfs
parent_interface: eth1
prefix_length_v4: 24
skip_nm: false
vlan_id: 124
ceph-1:
hostname: ceph-1
name: ceph-1
Expand Down Expand Up @@ -110,6 +120,16 @@ instances:
prefix_length_v4: 24
skip_nm: false
vlan_id: 123
nfs:
interface_name: eth1.124
ip_v4: 172.21.0.112
mac_addr: '52:54:00:1b:1c:e6'
mtu: 1500
network_name: nfs
parent_interface: eth1
prefix_length_v4: 24
skip_nm: false
vlan_id: 124
ceph-2:
hostname: ceph-2
name: ceph-2
Expand Down Expand Up @@ -165,6 +185,16 @@ instances:
prefix_length_v4: 24
skip_nm: false
vlan_id: 123
nfs:
interface_name: eth1.124
ip_v4: 172.21.0.113
mac_addr: '52:54:00:1b:1c:e7'
mtu: 1500
network_name: nfs
parent_interface: eth1
prefix_length_v4: 24
skip_nm: false
vlan_id: 124
controller-0:
hostname: controller-0
name: controller-0
Expand Down Expand Up @@ -235,6 +265,16 @@ instances:
prefix_length_v4: 24
skip_nm: false
vlan_id: 122
nfs:
interface_name: enp6s0.124
ip_v4: 172.21.0.10
mac_addr: '52:54:00:18:a1:f6'
mtu: 1500
network_name: nfs
parent_interface: enp6s0
prefix_length_v4: 24
skip_nm: false
vlan_id: 124
ocp-1:
hostname: osasinfra-master-1
name: ocp-1
Expand Down Expand Up @@ -292,6 +332,16 @@ instances:
prefix_length_v4: 24
skip_nm: false
vlan_id: 122
nfs:
interface_name: enp6s0.124
ip_v4: 172.21.0.11
mac_addr: '52:54:00:18:a1:f7'
mtu: 1500
network_name: nfs
parent_interface: enp6s0
prefix_length_v4: 24
skip_nm: false
vlan_id: 124
ocp-2:
hostname: osasinfra-master-2
name: ocp-2
Expand Down Expand Up @@ -349,6 +399,16 @@ instances:
prefix_length_v4: 24
skip_nm: false
vlan_id: 122
nfs:
interface_name: enp6s0.124
ip_v4: 172.21.0.12
mac_addr: '52:54:00:18:a1:f8'
mtu: 1500
network_name: nfs
parent_interface: enp6s0
prefix_length_v4: 24
skip_nm: false
vlan_id: 124
networker-0:
hostname: networker-0
name: networker-0
Expand Down Expand Up @@ -447,6 +507,15 @@ instances:
parent_interface: eth1
skip_nm: false
vlan_id: 22
nfs:
interface_name: eth1.24
ip_v4: 172.21.0.100
mac_addr: '52:54:00:1b:1c:e8'
mtu: 1500
network_name: nfs
parent_interface: eth1
skip_nm: false
vlan_id: 24
compute-1:
hostname: compute-1
name: compute-1
Expand Down Expand Up @@ -485,6 +554,15 @@ instances:
parent_interface: eth1
skip_nm: false
vlan_id: 22
nfs:
interface_name: eth1.24
ip_v4: 172.21.0.101
mac_addr: '52:54:00:1b:1c:e9'
mtu: 1500
network_name: nfs
parent_interface: eth1
skip_nm: false
vlan_id: 24
compute-2:
hostname: compute-2
name: compute-2
Expand Down Expand Up @@ -523,6 +601,15 @@ instances:
parent_interface: eth1
skip_nm: false
vlan_id: 22
nfs:
interface_name: eth1.24
ip_v4: 172.21.0.102
mac_addr: '52:54:00:1b:1c:e0'
mtu: 1500
network_name: nfs
parent_interface: eth1
skip_nm: false
vlan_id: 24
networks:
ctlplane:
dns_v4:
Expand Down Expand Up @@ -716,4 +803,37 @@ networks:
start_host: 100
ipv6_ranges: []
vlan_id: 122
nfs:
dns_v4: []
dns_v6: []
mtu: 1496
network_name: nfs
network_v4: 172.21.0.0/24
search_domain: nfs.example.com
tools:
metallb:
ipv4_ranges:
- end: 172.21.0.90
end_host: 90
length: 11
start: 172.21.0.80
start_host: 80
ipv6_ranges: []
multus:
ipv4_ranges:
- end: 172.21.0.70
end_host: 70
length: 41
start: 172.21.0.30
start_host: 30
ipv6_ranges: []
netconfig:
ipv4_ranges:
- end: 172.21.0.250
end_host: 250
length: 151
start: 172.21.0.100
start_host: 100
ipv6_ranges: []
vlan_id: 124
routers: {}
6 changes: 3 additions & 3 deletions dt/uni04delta/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ transformers:
create: true
components:
- ../../lib/networking/metallb
- ../../lib/networking/netconfig
- ../../lib/networking/nad
- networking/metallb
fultonj marked this conversation as resolved.
Show resolved Hide resolved
- networking/netconfig
- networking/nad
- ../../lib/control-plane

patches:
Expand Down
8 changes: 8 additions & 0 deletions dt/uni04delta/networking/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

components:
- metallb
- nad
- netconfig
181 changes: 181 additions & 0 deletions dt/uni04delta/networking/metallb/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,181 @@
---
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

resources:
- metallb_l2advertisement.yaml
- ocp_ip_pools.yaml

patches:
- target:
kind: IPAddressPool
labelSelector: "osp/lb-addresses-type=standard"
path: ocp_ip_pool_template.yaml

replacements:
# IPAddressPool addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.ctlplane.lb_addresses
targets:
- select:
kind: IPAddressPool
name: ctlplane
fieldPaths:
- spec.addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.internalapi.lb_addresses
targets:
- select:
kind: IPAddressPool
name: internalapi
fieldPaths:
- spec.addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.storage.lb_addresses
targets:
- select:
kind: IPAddressPool
name: storage
fieldPaths:
- spec.addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.tenant.lb_addresses
targets:
- select:
kind: IPAddressPool
name: tenant
fieldPaths:
- spec.addresses

# Loadbalancer address pools
- source:
kind: ConfigMap
name: network-values
fieldPath: data.ctlplane.lb_addresses
targets:
- select:
group: metallb.io
kind: IPAddressPool
name: ctlplane
fieldPaths:
- spec.addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.internalapi.lb_addresses
targets:
- select:
group: metallb.io
kind: IPAddressPool
name: internalapi
fieldPaths:
- spec.addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.tenant.lb_addresses
targets:
- select:
group: metallb.io
kind: IPAddressPool
name: tenant
fieldPaths:
- spec.addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.ctlplane.lb_addresses
targets:
- select:
group: metallb.io
kind: IPAddressPool
name: ctlplane
fieldPaths:
- spec.addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.storage.lb_addresses
targets:
- select:
group: metallb.io
kind: IPAddressPool
name: storage
fieldPaths:
- spec.addresses
- source:
kind: ConfigMap
name: network-values
fieldPath: data.nfs.lb_addresses
targets:
- select:
group: metallb.io
kind: IPAddressPool
name: nfs
fieldPaths:
- spec.addresses

# Loadbalancer interfaces
- source:
kind: ConfigMap
name: network-values
fieldPath: data.bridgeName
targets:
- select:
group: metallb.io
kind: L2Advertisement
name: ctlplane
fieldPaths:
- spec.interfaces.0
- source:
kind: ConfigMap
name: network-values
fieldPath: data.tenant.iface
targets:
- select:
group: metallb.io
kind: L2Advertisement
name: tenant
fieldPaths:
- spec.interfaces.0
- source:
kind: ConfigMap
name: network-values
fieldPath: data.storage.iface
targets:
- select:
group: metallb.io
kind: L2Advertisement
name: storage
fieldPaths:
- spec.interfaces.0
- source:
kind: ConfigMap
name: network-values
fieldPath: data.internalapi.iface
targets:
- select:
group: metallb.io
kind: L2Advertisement
name: internalapi
fieldPaths:
- spec.interfaces.0
- source:
kind: ConfigMap
name: network-values
fieldPath: data.nfs.iface
targets:
- select:
group: metallb.io
kind: L2Advertisement
name: nfs
fieldPaths:
- spec.interfaces.0
Loading