@@ -135,16 +135,9 @@ Summary: %{product_name} Test Suite
135
135
136
136
%package node
137
137
Summary: %{product_name } Node
138
- Requires: %{name } = %{version }-%{release }
139
138
Requires: %{name }-hyperkube = %{version }-%{release }
140
- Requires: docker >= %{docker_version }
141
139
Requires: util-linux
142
140
Requires: socat
143
- Requires: nfs-utils
144
- Requires: cifs-utils
145
- Requires: ethtool
146
- Requires: device-mapper-persistent-data >= 0.6.2
147
- Requires: conntrack-tools
148
141
Requires(post): systemd
149
142
Requires(preun): systemd
150
143
Requires(postun): systemd
@@ -187,6 +180,7 @@ Requires: bridge-utils
187
180
Requires: ethtool
188
181
Requires: procps-ng
189
182
Requires: iproute
183
+ Requires: conntrack-tools
190
184
Obsoletes: openshift-sdn-ovs < %{package_refactor_version }
191
185
192
186
%description sdn-ovs
@@ -308,11 +302,6 @@ done
308
302
309
303
install -d -m 0755 %{buildroot }%{_sysconfdir }/origin/{master,node}
310
304
311
- # different service for origin vs aos
312
- # install -m 0644 contrib/systemd/%{name}-node.service %{buildroot}%{_unitdir}/%{name}-node.service
313
- # same sysconfig files for origin vs aos
314
- install -m 0644 contrib/systemd/origin-node.sysconfig %{buildroot }%{_sysconfdir }/sysconfig/%{name }-node
315
-
316
305
# Install man1 man pages
317
306
install -d -m 0755 %{buildroot }%{_mandir }/man1
318
307
install -m 0644 docs/man/man1/* %{buildroot }%{_mandir }/man1/
@@ -394,7 +383,6 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
394
383
%files node
395
384
%{_bindir }/openshift-node-config
396
385
%{_sysconfdir }/systemd/system.conf.d/origin-accounting.conf
397
- %config(noreplace) %{_sysconfdir }/sysconfig/%{name }-node
398
386
%defattr(-,root,root,0700)
399
387
%config(noreplace) %{_sysconfdir }/origin/node
400
388
0 commit comments