Skip to content

Commit 447f9b8

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 <pepalani@redhat.com>
1 parent 8d09651 commit 447f9b8

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
machineconfiguration.openshift.io/role: master
77
name: 80-ipsec-master-extensions
88
spec:
9+
osImageURL: quay.io/pepalani/ipsec-rhcos-layered-image:nm-libreswan-fix
910
config:
1011
ignition:
1112
version: 3.2.0
@@ -20,11 +21,9 @@ spec:
2021
2122
[Service]
2223
Type=oneshot
23-
ExecStartPre=rm -f /etc/ipsec.d/cno.conf
24+
ExecStartPre=systemd-tmpfiles --create /usr/lib/rpm-ostree/tmpfiles.d/libreswan.conf
2425
ExecStart=systemctl enable --now ipsec.service
2526
2627
[Install]
2728
WantedBy=multi-user.target
28-
extensions:
29-
- ipsec
3029
{{end}}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
machineconfiguration.openshift.io/role: worker
77
name: 80-ipsec-worker-extensions
88
spec:
9+
osImageURL: quay.io/pepalani/ipsec-rhcos-layered-image:nm-libreswan-fix
910
config:
1011
ignition:
1112
version: 3.2.0
@@ -20,11 +21,9 @@ spec:
2021
2122
[Service]
2223
Type=oneshot
23-
ExecStartPre=rm -f /etc/ipsec.d/cno.conf
24+
ExecStartPre=systemd-tmpfiles --create /usr/lib/rpm-ostree/tmpfiles.d/libreswan.conf
2425
ExecStart=systemctl enable --now ipsec.service
2526
2627
[Install]
2728
WantedBy=multi-user.target
28-
extensions:
29-
- ipsec
3029
{{end}}

0 commit comments

Comments
 (0)