Skip to content

Commit ebd1e8b

Browse files
committed
Use custom layered image to test nm-libreswan fix
test duplicate key 'phase2alg' fix for nncp deployment Signed-off-by: Periyasamy Palanisamy <[email protected]>
1 parent 8d09651 commit ebd1e8b

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

bindata/network/ovn-kubernetes/common/80-ipsec-master-extensions.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ kind: MachineConfig
44
metadata:
55
labels:
66
machineconfiguration.openshift.io/role: master
7+
annotations:
8+
user-ipsec-machine-config: "true"
79
name: 80-ipsec-master-extensions
810
spec:
11+
osImageURL: quay.io/pepalani/ipsec-rhcos-layered-image:nm-libreswan-fix
912
config:
1013
ignition:
1114
version: 3.2.0
@@ -20,11 +23,9 @@ spec:
2023
2124
[Service]
2225
Type=oneshot
23-
ExecStartPre=rm -f /etc/ipsec.d/cno.conf
26+
ExecStartPre=systemd-tmpfiles --create /usr/lib/rpm-ostree/tmpfiles.d/libreswan.conf
2427
ExecStart=systemctl enable --now ipsec.service
2528
2629
[Install]
2730
WantedBy=multi-user.target
28-
extensions:
29-
- ipsec
3031
{{end}}

bindata/network/ovn-kubernetes/common/80-ipsec-worker-extensions.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ kind: MachineConfig
44
metadata:
55
labels:
66
machineconfiguration.openshift.io/role: worker
7+
annotations:
8+
user-ipsec-machine-config: "true"
79
name: 80-ipsec-worker-extensions
810
spec:
11+
osImageURL: quay.io/pepalani/ipsec-rhcos-layered-image:nm-libreswan-fix
912
config:
1013
ignition:
1114
version: 3.2.0
@@ -20,11 +23,9 @@ spec:
2023
2124
[Service]
2225
Type=oneshot
23-
ExecStartPre=rm -f /etc/ipsec.d/cno.conf
26+
ExecStartPre=systemd-tmpfiles --create /usr/lib/rpm-ostree/tmpfiles.d/libreswan.conf
2427
ExecStart=systemctl enable --now ipsec.service
2528
2629
[Install]
2730
WantedBy=multi-user.target
28-
extensions:
29-
- ipsec
3031
{{end}}

0 commit comments

Comments
 (0)