CLOUDSTACK-6892: Create separate package for the mysql HA component Manually picked from Hugo's fix: 539db08956eff322efd11771d46d29df0c7289b2
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/907d39fb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/907d39fb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/907d39fb Branch: refs/heads/4.3 Commit: 907d39fb949c9fc41ed83ba005774bfb14159a25 Parents: e4ae5b2 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Wed Aug 20 12:00:08 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Wed Aug 20 12:00:08 2014 +0200 ---------------------------------------------------------------------- client/tomcatconf/catalina.properties.in | 2 +- packaging/centos63/cloud.spec | 36 +++++++++++++++++++++++++-- packaging/centos63/package.sh | 7 +++++- 3 files changed, 41 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/907d39fb/client/tomcatconf/catalina.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/catalina.properties.in b/client/tomcatconf/catalina.properties.in index ce03ff6..282892b 100644 --- a/client/tomcatconf/catalina.properties.in +++ b/client/tomcatconf/catalina.properties.in @@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache # "foo/*.jar": Add all the JARs of the specified folder as class # repositories # "foo/bar.jar": Add bar.jar as a class repository -common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar +common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar,/usr/share/cloudstack-mysql-ha/lib/*jar # # List of comma-separated paths defining the contents of the "server" http://git-wip-us.apache.org/repos/asf/cloudstack/blob/907d39fb/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index b363a2e..22f4041 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -177,6 +177,17 @@ Group: System Environment/Libraries %description awsapi Apache Cloudstack AWS API compatibility wrapper +%if "%{_ossnoss}" == "NOREDIST" +%package mysql-ha +Summary: Apache CloudStack Balancing Strategy for MySQL +Requires: mysql-connector-java +Requires: tomcat7 +Group: System Environmnet/Libraries +%description mysql-ha +Apache CloudStack Balancing Strategy for MySQL + +%endif + %prep echo Doing CloudStack build @@ -343,6 +354,12 @@ for name in cloud-bridge.properties commons-logging.properties ec2-service.prope ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name done +# 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 +fi + #Don't package the below for AWS API rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt @@ -362,10 +379,15 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agen install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE -install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE -install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE +install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE +install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{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} @@ -646,11 +668,21 @@ fi %{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE %{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE +%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 +%endif + %files baremetal-agent %attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal %changelog +* Fri Jul 04 2014 Hugo Trippaers <h...@apache.org> 4.3.1 +- Add a package for the mysql ha module * Fri Oct 03 2012 Hugo Trippaers <h...@apache.org> 4.1.0 - new style spec file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/907d39fb/packaging/centos63/package.sh ---------------------------------------------------------------------- diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh index 04b9258..cde7662 100755 --- a/packaging/centos63/package.sh +++ b/packaging/centos63/package.sh @@ -41,7 +41,7 @@ fi VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep '^[0-9]\.'` -if echo $VERSION | grep SNAPSHOT ; then +if echo $VERSION | grep -q SNAPSHOT ; then REALVER=`echo $VERSION | cut -d '-' -f 1` DEFVER="-D_ver $REALVER" DEFPRE="-D_prerelease 1" @@ -52,20 +52,25 @@ else DEFREL="-D_rel 1" fi +echo Preparing to package Apache CloudStack ${VERSION} + mkdir -p $RPMDIR/SPECS mkdir -p $RPMDIR/BUILD mkdir -p $RPMDIR/RPMS mkdir -p $RPMDIR/SRPMS mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION +echo ". preparing source tarball" (cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x ) (cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION) +echo ". executing rpmbuild" cp cloud.spec $RPMDIR/SPECS (cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} -bb SPECS/cloud.spec) +echo "Done" exit }
