Skip to content

Commit 1146c8c

Browse files
committed
Revert "Add swift interface"
This reverts commit 0139161. Jira: https://issues.redhat.com/browse/OSPRH-10496
1 parent 2ebbb1f commit 1146c8c

File tree

2 files changed

+0
-67
lines changed

2 files changed

+0
-67
lines changed

dt/pidone/kustomization.yaml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,37 +39,7 @@ patches:
3939
- _replaced_
4040
mtu: 1500
4141
42-
- target:
43-
kind: NetConfig
44-
patch: |-
45-
- op: add
46-
path: /spec/networks/-
47-
value:
48-
name: swift
49-
mtu: 1500
50-
dnsDomain: _replaced_
51-
subnets:
52-
- _replaced_
53-
5442
replacements:
55-
- source:
56-
kind: ConfigMap
57-
name: network-values
58-
fieldPath: data.swift.dnsDomain
59-
targets:
60-
- select:
61-
kind: NetConfig
62-
fieldPaths:
63-
- spec.networks.[name=swift].dnsDomain
64-
- source:
65-
kind: ConfigMap
66-
name: network-values
67-
fieldPath: data.swift.subnets
68-
targets:
69-
- select:
70-
kind: NetConfig
71-
fieldPaths:
72-
- spec.networks.[name=swift].subnets
7343
- source:
7444
kind: ConfigMap
7545
name: service-values

examples/dt/pidone/nncp/values.yaml

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,49 +14,42 @@ data:
1414
tenant_ip: 172.19.0.5
1515
ctlplane_ip: 192.168.122.10
1616
storage_ip: 172.18.0.5
17-
swift_ip: 172.22.0.5
1817
node_1:
1918
name: ostest-master-1
2019
internalapi_ip: 172.17.0.6
2120
tenant_ip: 172.19.0.6
2221
ctlplane_ip: 192.168.122.11
2322
storage_ip: 172.18.0.6
24-
swift_ip: 172.22.0.6
2523
node_2:
2624
name: ostest-master-2
2725
internalapi_ip: 172.17.0.7
2826
tenant_ip: 172.19.0.7
2927
ctlplane_ip: 192.168.122.12
3028
storage_ip: 172.18.0.7
31-
swift_ip: 172.22.0.7
3229
node_3:
3330
name: ostest-worker-0
3431
internalapi_ip: 172.17.0.8
3532
tenant_ip: 172.19.0.8
3633
ctlplane_ip: 192.168.122.13
3734
storage_ip: 172.18.0.8
38-
swift_ip: 172.22.0.8
3935
node_4:
4036
name: ostest-worker-1
4137
internalapi_ip: 172.17.0.9
4238
tenant_ip: 172.19.0.9
4339
ctlplane_ip: 192.168.122.14
4440
storage_ip: 172.18.0.9
45-
swift_ip: 172.22.0.9
4641
node_5:
4742
name: ostest-worker-2
4843
internalapi_ip: 172.17.0.10
4944
tenant_ip: 172.19.0.10
5045
ctlplane_ip: 192.168.122.15
5146
storage_ip: 172.18.0.10
52-
swift_ip: 172.22.0.10
5347
node_6:
5448
name: ostest-worker-3
5549
internalapi_ip: 172.17.0.11
5650
tenant_ip: 172.19.0.11
5751
ctlplane_ip: 192.168.122.16
5852
storage_ip: 172.18.0.11
59-
swift_ip: 172.22.0.11
6053

6154
# networks
6255
ctlplane:
@@ -203,36 +196,6 @@ data:
203196
gateway: 10.0.0.1
204197
name: subnet1
205198
mtu: 1500
206-
swift:
207-
dnsDomain: swift.example.com
208-
subnets:
209-
- allocationRanges:
210-
- end: 172.22.0.250
211-
start: 172.22.0.100
212-
cidr: 172.22.0.0/24
213-
gateway: 172.22.0.1
214-
name: subnet1
215-
vlan: 25
216-
mtu: 1500
217-
prefix-length: 24
218-
iface: swift
219-
vlan: 25
220-
base_iface: enp6s0
221-
lb_addresses:
222-
- 172.22.0.80-172.22.0.90
223-
net-attach-def: |
224-
{
225-
"cniVersion": "0.3.1",
226-
"name": "swift",
227-
"type": "macvlan",
228-
"master": "swift",
229-
"ipam": {
230-
"type": "whereabouts",
231-
"range": "172.22.0.0/24",
232-
"range_start": "172.22.0.100",
233-
"range_end": "172.22.0.250"
234-
}
235-
}
236199
datacentre:
237200
net-attach-def: |
238201
{

0 commit comments

Comments
 (0)