Merge pull request #2604 from pacevedom/USHIFT-1872

OCPBUGS-23220: Remove keyfile nm plugin force when installing
openshift · Nov 14, 2023 · 0b46b9e · 0b46b9e
2 parents adf3ec6 + c10018e
commit 0b46b9e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/packaging/network-manager-conf/microshift-nm.conf b/packaging/network-manager-conf/microshift-nm.conf
diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec
@@ -188,9 +188,6 @@ install -p -m644 packaging/crio.conf.d/microshift_amd64.conf %{buildroot}%{_sysc
 
 install -p -m644 packaging/crio.conf.d/microshift-ovn.conf %{buildroot}%{_sysconfdir}/crio/crio.conf.d/microshift-ovn.conf
 
-install -d -m755  %{buildroot}%{_sysconfdir}/NetworkManager/conf.d
-install -p -m644  packaging/network-manager-conf/microshift-nm.conf %{buildroot}%{_sysconfdir}/NetworkManager/conf.d/microshift-nm.conf
-
 install -d -m755 %{buildroot}/%{_unitdir}
 install -p -m644 packaging/systemd/microshift.service %{buildroot}%{_unitdir}/microshift.service
 
@@ -335,7 +332,6 @@ systemctl enable --now --quiet openvswitch || true
 
 %files networking
 %{_sysconfdir}/crio/crio.conf.d/microshift-ovn.conf
-%{_sysconfdir}/NetworkManager/conf.d/microshift-nm.conf
 %{_sysconfdir}/systemd/system/ovs-vswitchd.service.d/microshift-cpuaffinity.conf
 %{_sysconfdir}/systemd/system/ovsdb-server.service.d/microshift-cpuaffinity.conf
 %{_sysconfdir}/systemd/system/firewalld.service.d/firewalld-no-iptables.conf