This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push: new 9b35b64 packaging: install plugins at /usr/share/cloudstack-management/lib (#2915) 9b35b64 is described below commit 9b35b64b3ca27364fca4c832f9162aea90901a4c Author: Rohit Yadav <ro...@apache.org> AuthorDate: Wed Oct 24 18:21:03 2018 +0530 packaging: install plugins at /usr/share/cloudstack-management/lib (#2915) Install any additional plugin jars in the lib directory to be picked up by the classpath builder, otherwise one has to manually add the jar to /etc/default/cloudstack-management after installation. This fixes the issue for `mysql-ha` plugin. Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> --- packaging/centos63/cloud.spec | 10 ++-------- packaging/centos7/cloud.spec | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 0d99ec33..a957380 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -356,7 +356,7 @@ cp -r test/integration/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests/ # MYSQL HA if [ "x%{_ossnoss}" == "xnoredist" ] ; then mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib - cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib + cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib fi #License files from whisker @@ -374,10 +374,6 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvi install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE -if [ "x%{_ossnoss}" == "xnoredist" ] ; then - install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE - install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE -fi %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} @@ -627,9 +623,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz %if "%{_ossnoss}" == "noredist" %files mysql-ha %defattr(0644,cloud,cloud,0755) -%attr(0644,root,root) %{_datadir}/%{name}-mysql-ha/lib/* -%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE -%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE +%attr(0644,root,root) %{_datadir}/%{name}-management/lib/*mysqlha*jar %endif %files baremetal-agent diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index c29d18b..38f90ce 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -333,7 +333,7 @@ cp -r test/integration/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests/ # MYSQL HA if [ "x%{_ossnoss}" == "xnoredist" ] ; then mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib - cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib + cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib fi #License files from whisker @@ -351,10 +351,6 @@ install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvi install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-integration-tests-%{version}/LICENSE -if [ "x%{_ossnoss}" == "xnoredist" ] ; then - install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE - install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE -fi %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} @@ -575,9 +571,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz %if "%{_ossnoss}" == "noredist" %files mysql-ha %defattr(0644,cloud,cloud,0755) -%attr(0644,root,root) %{_datadir}/%{name}-mysql-ha/lib/* -%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE -%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE +%attr(0644,root,root) %{_datadir}/%{name}-management/lib/*mysqlha*jar %endif %files baremetal-agent