Skip to content

Commit

Permalink
cleanup duplication
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhubx007
zhubx007 committed May 17, 2016
1 parent 98aac3c commit 3a787a8
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 762 deletions.
10 changes: 10 additions & 0 deletions centos7/vsm-deploy/vsm-deploy.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ install -p -D -m 755 tools/etc/vsm/server.manifest %{buildroot}%{_sysconfdir}/ma
install -d -m 755 %{buildroot}%{_usr}/local/bin/
install -d -m 755 %{buildroot}%{_usr}/local/bin/tools

install -p -D -m 755 cluster_manifest %{buildroot}%{_usr}/local/bin/cluster_manifest
install -p -D -m 755 server_manifest %{buildroot}%{_usr}/local/bin/server_manifest
install -p -D -m 755 admin-token %{buildroot}%{_bindir}/admin-token
install -p -D -m 755 agent-token %{buildroot}%{_bindir}/agent-token
install -p -D -m 755 getip %{buildroot}%{_usr}/local/bin/getip
install -p -D -m 755 vsm-controller %{buildroot}%{_usr}/local/bin/vsm-controller
install -p -D -m 755 vsm-installer %{buildroot}%{_usr}/local/bin/vsm-installer
install -p -D -m 755 vsm-node %{buildroot}%{_usr}/local/bin/vsm-node
Expand Down Expand Up @@ -79,6 +84,11 @@ exit 0
%files
%defattr(-,root,root,-)
%dir %{_usr}
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/cluster_manifest
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/server_manifest
%config(noreplace) %attr(-, root, vsm) %{_bindir}/admin-token
%config(noreplace) %attr(-, root, vsm) %{_bindir}/agent-token
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/getip
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/vsm-controller
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/restart-all
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/replace-str
Expand Down
10 changes: 0 additions & 10 deletions centos7/vsm/vsm.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,11 @@ install -p -D -m 755 bin/auto_key_gen %{buildroot}%{_bindir}/auto_key_gen
install -p -D -m 755 bin/vsm-assist %{buildroot}%{_bindir}/vsm-assist
install -p -D -m 755 bin/presentpool %{buildroot}%{_bindir}/presentpool
install -p -D -m 755 bin/rbd_ls %{buildroot}%{_bindir}/rbd_ls
install -p -D -m 755 bin/agent-token %{buildroot}%{_bindir}/agent-token
install -p -D -m 755 bin/admin-token %{buildroot}%{_bindir}/admin-token
install -p -D -m 755 bin/vsm-backup %{buildroot}%{_bindir}/vsm-backup
install -p -D -m 755 bin/vsm-restore %{buildroot}%{_bindir}/vsm-restore
install -p -D -m 755 bin/cluster_manifest %{buildroot}%{_usr}/local/bin/cluster_manifest
install -p -D -m 755 bin/server_manifest %{buildroot}%{_usr}/local/bin/server_manifest
install -p -D -m 755 bin/refresh-osd-status %{buildroot}%{_usr}/local/bin/refresh-osd-status
install -p -D -m 755 bin/refresh-cluster-status %{buildroot}%{_usr}/local/bin/refresh-cluster-status
install -p -D -m 755 bin/check_xtrust_crudini %{buildroot}%{_usr}/local/bin/check_xtrust_crudini
install -p -D -m 755 bin/getip %{buildroot}%{_usr}/local/bin/getip
install -p -D -m 755 bin/import_ceph_conf %{buildroot}%{_usr}/local/bin/import_ceph_conf
install -p -D -m 755 bin/get_smart_info %{buildroot}%{_bindir}/get_smart_info
install -p -D -m 755 bin/kill_diamond %{buildroot}%{_bindir}/kill_diamond
Expand Down Expand Up @@ -263,8 +258,6 @@ exit 0
%config(noreplace) %attr(-, root, vsm) %{_bindir}/vsm-assist
%config(noreplace) %attr(-, root, vsm) %{_bindir}/presentpool
%config(noreplace) %attr(-, root, vsm) %{_bindir}/rbd_ls
%config(noreplace) %attr(-, root, vsm) %{_bindir}/agent-token
%config(noreplace) %attr(-, root, vsm) %{_bindir}/admin-token
%config(noreplace) %attr(-, root, vsm) %{_bindir}/vsm-backup
%config(noreplace) %attr(-, root, vsm) %{_bindir}/vsm-restore
%config(noreplace) %attr(-, root, vsm) %{_bindir}/get_smart_info
Expand All @@ -273,9 +266,6 @@ exit 0
%config(noreplace) %attr(-, root, vsm) %{_bindir}/vsm-ceph-upgrade
%config(noreplace) %attr(-, root, vsm) %{_usr}/sbin/nvme

%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/getip
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/cluster_manifest
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/server_manifest
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/refresh-osd-status
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/refresh-cluster-status
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/check_xtrust_crudini
Expand Down
0 source/vsm/bin/admin-token → source/vsm-deploy/admin-token
View file
File renamed without changes.
0 source/vsm/bin/agent-token → source/vsm-deploy/agent-token
100755 → 100644
View file
File renamed without changes.
19 changes: 19 additions & 0 deletions source/vsm-deploy/vsm-deploy.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@ install -p -D -m 755 tools/etc/vsm/server.manifest %{buildroot}%{_sysconfdir}/ma
install -d -m 755 %{buildroot}%{_usr}/local/bin/
install -d -m 755 %{buildroot}%{_usr}/local/bin/tools

install -p -D -m 755 admin-token %{buildroot}%{_bindir}/admin-token
install -p -D -m 755 agent-token %{buildroot}%{_bindir}/agent-token

%if 0%{?suse_version}
install -p -D -m 755 cluster_manifest %{buildroot}%{_usr}/bin/cluster_manifest
install -p -D -m 755 server_manifest %{buildroot}%{_usr}/bin/server_manifest
install -p -D -m 755 getip %{buildroot}%{_usr}/bin/getip
install -p -D -m 755 usr/bin/vsm-controller %{buildroot}%{_usr}/bin/vsm-controller
install -p -D -m 755 usr/bin/vsm-storage %{buildroot}%{_usr}/bin/vsm-storage
install -p -D -m 755 usr/bin/populate-servermanifest %{buildroot}%{_usr}/bin/populate-servermanifest
Expand Down Expand Up @@ -85,6 +91,9 @@ cp -rf tools/ %{buildroot}%{_usr}/lib/vsm/
cp -rf usr/bin/keys %{buildroot}%{_usr}/lib/vsm/
cp -rf usr/bin/tools/ %{buildroot}%{_usr}/lib/vsm/
%else
install -p -D -m 755 cluster_manifest %{buildroot}%{_usr}/local/bin/cluster_manifest
install -p -D -m 755 server_manifest %{buildroot}%{_usr}/local/bin/server_manifest
install -p -D -m 755 getip %{buildroot}%{_usr}/local/bin/getip
install -p -D -m 755 vsm-controller %{buildroot}%{_usr}/local/bin/vsm-controller
install -p -D -m 755 vsm-installer %{buildroot}%{_usr}/local/bin/vsm-installer
install -p -D -m 755 vsm-node %{buildroot}%{_usr}/local/bin/vsm-node
Expand Down Expand Up @@ -123,6 +132,11 @@ exit 0
%if 0%{?suse_version}
%dir %{_sysconfdir}/systemd
%dir %{_sysconfdir}/systemd/system
%attr(-, root, root) %{_usr}/bin/cluster_manifest
%attr(-, root, root) %{_usr}/bin/server_manifest
%attr(-, root, root) %{_bindir}/admin-token
%attr(-, root, root) %{_bindir}/agent-token
%attr(-, root, root) %{_usr}/bin/getip
%attr(-, root, root) %{_usr}/bin/vsm-storage
%attr(-, root, root) %{_usr}/bin/partition-drives
%attr(-, root, root) %{_usr}/bin/populate-servermanifest
Expand Down Expand Up @@ -151,6 +165,11 @@ exit 0
%config(noreplace) %attr(-, root, root) %{_sysconfdir}/manifest/cluster.manifest
%{_sysconfdir}/systemd/system/epmd.socket
%else
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/cluster_manifest
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/server_manifest
%config(noreplace) %attr(-, root, vsm) %{_bindir}/admin-token
%config(noreplace) %attr(-, root, vsm) %{_bindir}/agent-token
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/getip
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/vsm-controller
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/restart-all
%config(noreplace) %attr(-, root, vsm) %{_usr}/local/bin/replace-str
Expand Down
245 changes: 0 additions & 245 deletions source/vsm/bin/cluster_manifest
View file

This file was deleted.

4 changes: 0 additions & 4 deletions source/vsm/bin/get_storages
View file

This file was deleted.

Loading

0 comments on commit 3a787a8

Please sign in to comment.