Change in vdsm[master]: Remove vdsm directories on uninstallation

Mark Wu has uploaded a new change for review.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Remove vdsm directories on uninstallation

Change-Id: I119c691cfdf6a487f36aef6ab451073af0230143
Signed-off-by: Mark Wu 
---
M vdsm.spec.in
1 file changed, 7 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/64/16764/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index 560e01a..4c103b9 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -796,6 +796,7 @@
 %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/mnt
 %dir %{_libexecdir}/%{vdsm_name}
 %dir %{_datadir}/%{vdsm_name}
+%dir %{_datadir}/%{vdsm_name}/netconf
 %dir %{_datadir}/%{vdsm_name}/storage
 %dir %{_datadir}/%{vdsm_name}/storage/imageRepository
 %{_datadir}/%{vdsm_name}/alignmentScan.py*
@@ -997,6 +998,8 @@
 %if !0%{?rhel}
 %config(noreplace) %{_sysconfdir}/%{vdsm_name}/vdsm.conf
 %endif
+%dir %{python_sitearch}/%{vdsm_name}
+%dir %{python_sitearch}/%{vdsm_name}/tool
 %{python_sitearch}/%{vdsm_name}/__init__.py*
 %{python_sitearch}/%{vdsm_name}/config.py*
 %{python_sitearch}/%{vdsm_name}/constants.py*
@@ -1028,6 +1031,8 @@
 %files tests
 %doc %{_datadir}/%{vdsm_name}/tests/README
 %defattr(-, root, root, -)
+%dir %{_datadir}/%{vdsm_name}/tests
+%dir %{_datadir}/%{vdsm_name}/tests/functional
 %{_datadir}/%{vdsm_name}/tests/*.py*
 %{_datadir}/%{vdsm_name}/tests/cpu_info.out
 %{_datadir}/%{vdsm_name}/tests/caps_libvirt_intel_E5649.out
@@ -1184,6 +1189,7 @@

%files xmlrpc
 %defattr(-, root, root, -)
+%dir %{_datadir}/%{vdsm_name}
 %{_datadir}/%{vdsm_name}/BindingXMLRPC.py*

%files api
@@ -1196,6 +1202,7 @@
 %{_datadir}/%{vdsm_name}/Bridge.py*

%files yajsonrpc
+%dir %{python_sitearch}/yajsonrpc
 %{python_sitearch}/yajsonrpc/__init__.py*
 %{python_sitearch}/yajsonrpc/asyncoreReactor.py*
 %{python_sitearch}/yajsonrpc/protonReactor.py*

Mark Wu has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 1: Verified

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 1:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/2464/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/3274/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/3354/ : SUCCESS

Noam Slomianko has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 1: Code-Review+1

Now we only need to restore the network state when we remove vdsm and we are golden

Yaniv Bronhaim has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 1: Code-Review+1

seems it covers all sub directories as well. hope I didn't miss anything

Yaniv Bronhaim has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 1: -Code-Review

(1 comment)

btw, what about all the hooks directories as %dir %{_libexecdir}/%{vdsm_name}/hooks, don't we need to remove those as well?

....................................................
File vdsm.spec.in
Line 794: %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@
Line 795: %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/hsm-tasks
Line 796: %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/mnt
Line 797: %dir %{_libexecdir}/%{vdsm_name}
Line 798: %dir %{_datadir}/%{vdsm_name}
don't we need also:

%dir %{_datadir}/%{vdsm_name}/storage/protect
Line 799: %dir %{_datadir}/%{vdsm_name}/netconf
Line 800: %dir %{_datadir}/%{vdsm_name}/storage
Line 801: %dir %{_datadir}/%{vdsm_name}/storage/imageRepository
Line 802: %{_datadir}/%{vdsm_name}/alignmentScan.py*

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 1: Code-Review-1

(1 comment)

yes, we should explicitly own

%{_libexecdir}/%{vdsm_name}/hooks

....................................................
File vdsm.spec.in
Line 794: %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@
Line 795: %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/hsm-tasks
Line 796: %ghost %dir %attr(-, %{vdsm_user}, %{vdsm_group}) @vdsmrepo@/mnt
Line 797: %dir %{_libexecdir}/%{vdsm_name}
Line 798: %dir %{_datadir}/%{vdsm_name}
no. it exists only in git, not on runtime.
Line 799: %dir %{_datadir}/%{vdsm_name}/netconf
Line 800: %dir %{_datadir}/%{vdsm_name}/storage
Line 801: %dir %{_datadir}/%{vdsm_name}/storage/imageRepository
Line 802: %{_datadir}/%{vdsm_name}/alignmentScan.py*

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 2:

Build Successful

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/4197/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/3302/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/4118/ : SUCCESS

Mark Wu has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 2: Verified+1

Itamar Heim has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 2:

ping?

Yaniv Bronhaim has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 2: Code-Review+1

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Patch Set 2: Code-Review+2

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Remove vdsm directories on uninstallation
......................................................................

Remove vdsm directories on uninstallation

Change-Id: I119c691cfdf6a487f36aef6ab451073af0230143
Signed-off-by: Mark Wu 
Reviewed-on: http://gerrit.ovirt.org/16764
Reviewed-by: Yaniv Bronhaim 
Reviewed-by: Dan Kenigsberg 
---
M vdsm.spec.in
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Mark Wu: Verified
  Dan Kenigsberg: Looks good to me, approved