Change-Id: I4d5b4f5dd5ac3c75f246212ec97d1e0e9ea043f8
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4843
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Open vSwitch daemon/database/utilities |
| 4 | 4 |
Name: openvswitch |
| 5 | 5 |
Version: 2.8.2 |
| 6 |
-Release: 1%{?dist}
|
|
| 6 |
+Release: 2%{?dist}
|
|
| 7 | 7 |
License: ASL 2.0 and LGPLv2+ |
| 8 | 8 |
URL: http://www.openvswitch.org/ |
| 9 | 9 |
Group: System Environment/Daemons |
| ... | ... |
@@ -149,6 +149,10 @@ for service in openvswitch ovsdb-server ovs-vswitchd ovn-controller ovn-controll |
| 149 | 149 |
install -p -D -m 0644 rhel/usr_lib_systemd_system_${service}.service %{buildroot}/%{_unitdir}/${service}.service
|
| 150 | 150 |
done |
| 151 | 151 |
|
| 152 |
+mkdir -p %{buildroot}/%{_sysconfdir}/openvswitch
|
|
| 153 |
+install -p -D -m 0644 rhel/etc_openvswitch_default.conf %{buildroot}/%{_sysconfdir}/openvswitch/default.conf
|
|
| 154 |
+sed -i '/OVS_USER_ID=.*/c\OVS_USER_ID=' %{buildroot}/%{_sysconfdir}/openvswitch/default.conf
|
|
| 155 |
+ |
|
| 152 | 156 |
%check |
| 153 | 157 |
make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 154 | 158 |
|
| ... | ... |
@@ -200,6 +204,7 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 200 | 200 |
%{_unitdir}/ovs-vswitchd.service
|
| 201 | 201 |
%{_unitdir}/ovsdb-server.service
|
| 202 | 202 |
%{_libdir}/lib*
|
| 203 |
+%{_sysconfdir}/openvswitch/default.conf
|
|
| 203 | 204 |
%{_sysconfdir}/bash_completion.d/ovs-*-bashcomp.bash
|
| 204 | 205 |
%{_datadir}/openvswitch/*.ovsschema
|
| 205 | 206 |
%{_datadir}/openvswitch/bugtool-plugins/*
|
| ... | ... |
@@ -207,7 +212,6 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 207 | 207 |
%{_datadir}/openvswitch/scripts/ovs-*
|
| 208 | 208 |
%config(noreplace) %{_sysconfdir}/sysconfig/openvswitch
|
| 209 | 209 |
|
| 210 |
- |
|
| 211 | 210 |
%files -n python-openvswitch |
| 212 | 211 |
%{python2_sitelib}/*
|
| 213 | 212 |
|
| ... | ... |
@@ -275,6 +279,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 275 | 275 |
%{_mandir}/man8/ovn-trace.8.gz
|
| 276 | 276 |
|
| 277 | 277 |
%changelog |
| 278 |
+* Wed Feb 28 2018 Vinay Kulkarni <kulkarniv@vmware.com> 2.8.2-2 |
|
| 279 |
+- Setup the default conf file for local ovsdb server. |
|
| 278 | 280 |
* Tue Feb 27 2018 Vinay Kulkarni <kulkarniv@vmware.com> 2.8.2-1 |
| 279 | 281 |
- Update to OVS 2.8.2 |
| 280 | 282 |
* Tue Oct 10 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.7.0-9 |