cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/4.1 - CLOUDSTACK-1713: EC2 REST API: AWS API Installation Problems
Date Tue, 19 Mar 2013 17:10:02 GMT
Updated Branches:
  refs/heads/4.1 fff8048a3 -> d20bcce7a


CLOUDSTACK-1713: EC2 REST API: AWS API Installation Problems

Description: Added the pre run for awsapi where it will create the user 'cloud' during awsapi
install and removed the unwanted entries from packaging awsapi.

Signed-off-by: Chip Childers <chip.childers@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d20bcce7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d20bcce7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d20bcce7

Branch: refs/heads/4.1
Commit: d20bcce7a2531320c764ddffd5af3a52d8d3cf98
Parents: fff8048
Author: Pradeep Soundararajan <pradeep.soundararajan@citrix.com>
Authored: Tue Mar 19 13:09:20 2013 -0400
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Tue Mar 19 13:09:20 2013 -0400

----------------------------------------------------------------------
 packaging/centos63/cloud.spec |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d20bcce7/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 1b2c9a9..7bcfa24 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -288,9 +288,27 @@ install -D awsapi-setup/setup/cloud-setup-bridge ${RPM_BUILD_ROOT}%{_bindir}/clo
 install -D awsapi-setup/setup/cloudstack-aws-api-register ${RPM_BUILD_ROOT}%{_bindir}/cloudstack-aws-api-register
 cp -r awsapi-setup/db/mysql/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/setup
 
+#Don't package the below for AWS API
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/applicationContext.xml
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/cloud-bridge.properties
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/com
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/commons-logging.properties
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/db.properties
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/ec2-service.properties
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/LICENSE.txt
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/log4j.properties
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/log4j-vmops.xml
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/META-INF
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/NOTICE.txt
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/org
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/bridge/WEB-INF/classes/services.xml
+
 %clean
 [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
+%pre awsapi
+id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user"
\
+     -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true
 
 %preun management
 /sbin/service cloud-management stop || true


Mime
View raw message