Skip to content

Commit b4601be

Browse files
spark404yadvr
spark404
authored and
yadvr
committed
CLOUDSTACK-6892 Create separate package for the mysql HA component
(cherry picked from commit 539db08) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: packaging/centos63/cloud.spec
1 parent 6a26e77 commit b4601be

3 files changed

Lines changed: 40 additions & 5 deletions

File tree

‎client/tomcatconf/catalina.properties.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
4444
# "foo/*.jar": Add all the JARs of the specified folder as class
4545
# repositories
4646
# "foo/bar.jar": Add bar.jar as a class repository
47-
common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar,/usr/share/java/mysql-connector-java.jar
47+
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
4848

4949
#
5050
# List of comma-separated paths defining the contents of the "server"

‎packaging/centos63/cloud.spec‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,17 @@ Group: System Environment/Libraries
178178
%description awsapi
179179
Apache Cloudstack AWS API compatibility wrapper
180180

181+
%if "%{_ossnoss}" == "NOREDIST"
182+
%package mysql-ha
183+
Summary: Apache CloudStack Balancing Strategy for MySQL
184+
Requires: mysql-connector-java
185+
Requires: tomcat7
186+
Group: System Environmnet/Libraries
187+
%description mysql-ha
188+
Apache CloudStack Balancing Strategy for MySQL
189+
190+
%endif
191+
181192
%prep
182193
echo Doing CloudStack build
183194

@@ -342,6 +353,12 @@ for name in cloud-bridge.properties commons-logging.properties ec2-service.prope
342353
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
343354
done
344355

356+
# MYSQL HA
357+
if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
358+
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
359+
cp -r plugins/database/mysql-ha/target/cloud-plugin-database-mysqlha-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-mysql-ha/lib
360+
fi
361+
345362
#Don't package the below for AWS API
346363
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/db.properties
347364
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt
@@ -361,9 +378,13 @@ install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agen
361378
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
362379
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
363380
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE
364-
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
365-
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
381+
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE
382+
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE
366383
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE
384+
if [ "x%{_ossnoss}" == "xNOREDIST" ] ; then
385+
install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
386+
install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
387+
fi
367388

368389
%clean
369390
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -647,8 +668,17 @@ fi
647668
%files baremetal-agent
648669
%attr(0755,root,root) %{_bindir}/cloudstack-setup-baremetal
649670

671+
%if "%{_ossnoss}" == "NOREDIST"
672+
%files mysql-ha
673+
%defattr(0644,cloud,cloud,0755)
674+
%attr(0644,root,root) %{_datadir}/%{name}-mysql-ha/lib/*
675+
%{_defaultdocdir}/%{name}-mysql-ha-%{version}/LICENSE
676+
%{_defaultdocdir}/%{name}-mysql-ha-%{version}/NOTICE
677+
%endif
650678

651679
%changelog
680+
* Fri Jul 04 2014 Hugo Trippaers <hugo@apache.org> 4.4.1
681+
- Add a package for the mysql ha module
682+
652683
* Fri Oct 03 2012 Hugo Trippaers <hugo@apache.org> 4.1.0
653684
- new style spec file
654-

‎packaging/centos63/package.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function packaging() {
3939
fi
4040

4141
VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep --color=none '^[0-9]\.'`
42-
if echo $VERSION | grep SNAPSHOT ; then
42+
if echo $VERSION | grep -q SNAPSHOT ; then
4343
REALVER=`echo $VERSION | cut -d '-' -f 1`
4444
DEFVER="-D_ver $REALVER"
4545
DEFPRE="-D_prerelease 1"
@@ -50,19 +50,24 @@ function packaging() {
5050
DEFREL="-D_rel 1"
5151
fi
5252

53+
echo Preparing to package Apache CloudStack ${VERSION}
54+
5355
mkdir -p $RPMDIR/SPECS
5456
mkdir -p $RPMDIR/BUILD
5557
mkdir -p $RPMDIR/RPMS
5658
mkdir -p $RPMDIR/SRPMS
5759
mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION
5860

61+
echo ". preparing source tarball"
5962
(cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x )
6063
(cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION)
6164

65+
echo ". executing rpmbuild"
6266
cp cloud.spec $RPMDIR/SPECS
6367

6468
(cd $RPMDIR; rpmbuild --define "_topdir $RPMDIR" "${DEFVER}" "${DEFREL}" ${DEFPRE+"${DEFPRE}"} ${DEFOSSNOSS+"$DEFOSSNOSS"} -bb SPECS/cloud.spec)
6569

70+
echo "Done"
6671
exit
6772
}
6873

0 commit comments

Comments
 (0)