Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4966EE592 for ; Tue, 5 Feb 2013 18:07:00 +0000 (UTC) Received: (qmail 56234 invoked by uid 500); 5 Feb 2013 18:06:57 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 56161 invoked by uid 500); 5 Feb 2013 18:06:57 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 55924 invoked by uid 99); 5 Feb 2013 18:06:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 18:06:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0127F82A5CA; Tue, 5 Feb 2013 18:06:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [46/51] [abbrv] git commit: refs/heads/vim51_win8 - Summary: packaging updates Message-Id: <20130205180657.0127F82A5CA@tyr.zones.apache.org> Date: Tue, 5 Feb 2013 18:06:56 +0000 (UTC) Summary: packaging updates Renamed a whole bunch of stuff from cloud to cloudstack Fix startup of cloudstack-agent Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5bf6771e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5bf6771e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5bf6771e Branch: refs/heads/vim51_win8 Commit: 5bf6771e6008600397ae256fc78c8714d9953481 Parents: 2527302 Author: Hugo Trippaers Authored: Mon Feb 4 21:32:03 2013 +0100 Committer: Hugo Trippaers Committed: Mon Feb 4 21:35:24 2013 +0100 ---------------------------------------------------------------------- packaging/centos63/cloud-agent.rc | 8 +- packaging/centos63/cloud.spec | 265 ++++++++++++++++------------ packaging/centos63/replace.properties | 24 ++-- 3 files changed, 164 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5bf6771e/packaging/centos63/cloud-agent.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index 505118f..acf8131 100755 --- a/packaging/centos63/cloud-agent.rc +++ b/packaging/centos63/cloud-agent.rc @@ -24,14 +24,14 @@ . /etc/rc.d/init.d/functions -whatami=cloud-agent +whatami=cloudstack-agent # set environment variables SHORTNAME="$whatami" PIDFILE=/var/run/"$whatami".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" -LOGFILE=/var/log/cloud/agent/agent.log +LOGFILE=/var/log/cloudstack/agent/agent.log PROGNAME="Cloud Agent" CLASS="com.cloud.agent.AgentShell" JSVC=`which jsvc 2>/dev/null`; @@ -57,12 +57,12 @@ export JAVA_HOME SCP="" DCP="" -ACP=`ls /usr/share/cloud/java/* | tr '\n' ':'` +ACP=`ls /usr/share/cloudstack-agent/cloud-plugin-hypervisor-kvm-*.jar`":"`ls /usr/share/cloudstack-agent/lib/* | tr '\n' ':'` JCP="/usr/share/java/jna.jar:/usr/share/java/commons-daemon.jar" # We need to append the JSVC daemon JAR to the classpath # AgentShell implements the JSVC daemon methods -export CLASSPATH="$SCP:$DCP:$ACP:$JCP:/etc/cloud/agent:/usr/lib64/cloud/agent" +export CLASSPATH="$SCP:$DCP:$ACP:$JCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts" start() { echo -n $"Starting $PROGNAME: " http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5bf6771e/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 2b029e3..18fac49 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -92,6 +92,15 @@ management, and intelligence in CloudStack. %package common Summary: Apache CloudStack common files and scripts +Requires: python +Obsoletes: cloud-test < 4.1.0 +Obsoletes: cloud-scripts < 4.1.0 +Obsoletes: cloud-utils < 4.1.0 +Obsoletes: cloud-core < 4.1.0 +Obsoletes: cloud-deps < 4.1.0 +Obsoletes: cloud-python < 4.1.0 +Obsoletes: cloud-setup < 4.1.0 +Obsoletes: cloud-cli < 4.1.0 Group: System Environment/Libraries %description common The Apache CloudStack files shared between agent and management server @@ -109,7 +118,6 @@ Requires: jakarta-commons-daemon Requires: jakarta-commons-daemon-jsvc Provides: cloud-agent Obsoletes: cloud-agent < 4.1.0 -Obsoletes: cloud-agent < 4.1.0 Obsoletes: cloud-test < 4.1.0 Group: System Environment/Libraries %description agent @@ -149,9 +157,6 @@ echo Doing CloudStack build %build -# this fixes the /usr/com bug on centos5 -%define _localstatedir /var -%define _sharedstatedir /var/lib cp packaging/centos63/replace.properties build/replace.properties echo VERSION=%{_maventag} >> build/replace.properties echo PACKAGE=%{name} >> build/replace.properties @@ -159,92 +164,107 @@ mvn package -Dsystemvm %install [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} +# Common directories +mkdir -p ${RPM_BUILD_ROOT}%{_bindir} +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/ipallocator +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/mnt +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/management +mkdir -p ${RPM_BUILD_ROOT}%{_initrddir} +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig + # Common -mkdir -p ${RPM_BUILD_ROOT}/usr/share/cloudstack-scripts -cp -r scripts/* ${RPM_BUILD_ROOT}/usr/share/cloudstack-scripts +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms +mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/ +cp -r scripts/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/scripts +install -D console-proxy/dist/systemvm.iso ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.iso +install -D console-proxy/dist/systemvm.zip ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/vms/systemvm.zip +install python/lib/cloud_utils.py ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloud_utils.py +cp -r python/lib/cloudutils ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/ +python -m compileall ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloud_utils.py +python -m compileall ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloudutils # Management -mkdir -p ${RPM_BUILD_ROOT}%{_bindir} -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/cloud/setup -mkdir -p ${RPM_BUILD_ROOT}/usr/share/cloud/management/ -ln -sf /usr/share/tomcat6/bin ${RPM_BUILD_ROOT}/usr/share/cloud/management/bin -ln -sf /etc/cloud/management ${RPM_BUILD_ROOT}/usr/share/cloud/management/conf -ln -sf /usr/share/tomcat6/lib ${RPM_BUILD_ROOT}/usr/share/cloud/management/lib -ln -sf /var/log/cloud/management ${RPM_BUILD_ROOT}/usr/share/cloud/management/logs -ln -sf /var/cache/cloud/management/temp ${RPM_BUILD_ROOT}/usr/share/cloud/management/temp -ln -sf /var/cache/cloud/management/work ${RPM_BUILD_ROOT}/usr/share/cloud/management/work -mkdir -p ${RPM_BUILD_ROOT}/usr/share/cloud/management/webapps/client -mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud/management -mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud/agent -mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud/awsapi -mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud/ipallocator -mkdir -p ${RPM_BUILD_ROOT}/var/cache/cloud/management/work -mkdir -p ${RPM_BUILD_ROOT}/var/cache/cloud/management/temp -mkdir -p ${RPM_BUILD_ROOT}/var/lib/cloud/mnt -mkdir -p ${RPM_BUILD_ROOT}/var/lib/cloud/management -mkdir -p ${RPM_BUILD_ROOT}/etc/cloud/management -mkdir -p ${RPM_BUILD_ROOT}/etc/cloud/management/Catalina/localhost/client -mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d -mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig -mkdir -p ${RPM_BUILD_ROOT}/etc/cloud/management/Catalina/localhost/client - -install -D client/target/utilities/bin/* ${RPM_BUILD_ROOT}%{_bindir} -install -D console-proxy/dist/systemvm.iso ${RPM_BUILD_ROOT}/usr/share/cloud/management/webapps/client/WEB-INF/classes/vms/systemvm.iso -install -D console-proxy/dist/systemvm.zip ${RPM_BUILD_ROOT}/usr/share/cloud/management/webapps/client/WEB-INF/classes/vms/systemvm.zip - -cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/cloud/setup -cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* ${RPM_BUILD_ROOT}/usr/share/cloud/management/webapps/client +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management + +# Specific for tomcat +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client +ln -sf /usr/share/tomcat6/bin ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/bin +ln -sf /etc/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/conf +ln -sf /usr/share/tomcat6/lib ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib +ln -sf /var/log/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/logs +ln -sf /var/cache/%{name}/management/temp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/temp +ln -sf /var/cache/%{name}/management/work ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/work + +install -D client/target/utilities/bin/cloud-migrate-databases ${RPM_BUILD_ROOT}%{_bindir}/%{name}-migrate-databases +install -D client/target/utilities/bin/cloud-set-guest-password ${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-password +install -D client/target/utilities/bin/cloud-set-guest-sshkey ${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-sshkey +install -D client/target/utilities/bin/cloud-setup-databases ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-databases +install -D client/target/utilities/bin/cloud-setup-encryption ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-encryption +install -D client/target/utilities/bin/cloud-setup-management ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-management +install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir}/%{name}-sysvmadm +install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses + +cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup +cp -r client/target/cloud-client-ui-4.1.0-SNAPSHOT/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml \ catalina.policy catalina.properties db-enc.properties classpath.conf tomcat-users.xml web.xml ; do - mv ${RPM_BUILD_ROOT}/usr/share/cloud/management/webapps/client/WEB-INF/classes/$name \ - ${RPM_BUILD_ROOT}/etc/cloud/management/$name + mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \ + ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name done -mv ${RPM_BUILD_ROOT}/usr/share/cloud/management/webapps/client/WEB-INF/classes/context.xml \ - ${RPM_BUILD_ROOT}/etc/cloud/management/Catalina/localhost/client - -mkdir -p ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/ -cp -r python/lib/cloudutils ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/ -cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/ -install python/lib/cloud_utils.py ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/cloud_utils.py -install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}/usr/lib/python2.6/site-packages/cloudapis.py -install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/ +mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/context.xml \ + ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client + +install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py install -D client/target/pythonlibs/jasypt-1.9.0.jar ${RPM_BUILD_ROOT}%{_javadir}/jasypt-1.9.0.jar install -D client/target/pythonlibs/jasypt-1.8.jar ${RPM_BUILD_ROOT}%{_javadir}/jasypt-1.8.jar -install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/cloud-ipallocator -install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/cloud-management -install -D packaging/centos63/cloud-management.sysconfig ${RPM_BUILD_ROOT}/etc/sysconfig/cloud-management - -chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/cloud/management/Catalina -chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/cloud/management/Catalina/localhost -chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/cloud/management/Catalina/localhost/client -chmod 770 ${RPM_BUILD_ROOT}%{_sharedstatedir}/cloud/mnt -chmod 770 ${RPM_BUILD_ROOT}%{_sharedstatedir}/cloud/management -chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/cloud/management/work -chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/cloud/management/temp -chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/cloud/management -chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/cloud/agent -chmod -R ugo+x ${RPM_BUILD_ROOT}/usr/share/cloud/management/webapps/client/WEB-INF/classes/scripts +install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator +install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-management +install -D packaging/centos63/cloud-management.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}-management + +chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina +chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost +chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client +chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/mnt +chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/management +chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work +chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp +chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management +chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent # KVM Agent -mkdir -p ${RPM_BUILD_ROOT}/etc/cloud/agent -mkdir -p ${RPM_BUILD_ROOT}/var/log/cloud/agent -install -D packaging/centos63/cloud-agent.rc ${RPM_BUILD_ROOT}/etc/init.d/cloud-agent -install -D agent/target/transformed/agent.properties ${RPM_BUILD_ROOT}/etc/cloud/agent/agent.properties -install -D agent/target/transformed/environment.properties ${RPM_BUILD_ROOT}/etc/cloud/agent/environment.properties -install -D agent/target/transformed/log4j-cloud.xml ${RPM_BUILD_ROOT}/etc/cloud/agent/log4j-cloud.xml -install -D agent/target/transformed/cloud-setup-agent ${RPM_BUILD_ROOT}/usr/bin/cloud-setup-agent -install -D agent/target/transformed/cloud-ssh ${RPM_BUILD_ROOT}/usr/bin/cloud-ssh -install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventag}.jar ${RPM_BUILD_ROOT}/usr/share/cloud/java/cloud-plugin-hypervisor-kvm-%{_maventag}.jar -cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}/usr/share/cloud/java +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib +install -D packaging/centos63/cloud-agent.rc ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}-agent +install -D agent/target/transformed/agent.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/agent.properties +install -D agent/target/transformed/environment.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/environment.properties +install -D agent/target/transformed/log4j-cloud.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/log4j-cloud.xml +install -D agent/target/transformed/cloud-setup-agent ${RPM_BUILD_ROOT}%{_bindir}/%{name}-setup-agent +install -D agent/target/transformed/cloud-ssh ${RPM_BUILD_ROOT}%{_bindir}/%{name}-ssh +install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%name-agent/cloud-plugin-hypervisor-kvm-%{_maventag}.jar +cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib # Usage server -mkdir -p ${RPM_BUILD_ROOT}/usr/share/%{name}-usage/lib +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib install -D usage/target/cloud-usage-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/cloud-usage-%{_maventag}.jar cp usage/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/ install -D packaging/centos63/cloud-usage.rc ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/%{name}-usage -mkdir -p ${RPM_BUILD_ROOT}/var/log/%{name}/usage/ +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/ + +# CLI +cp -r cloud-cli/cloudtool ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/ +install cloud-cli/cloudapis/cloud.py ${RPM_BUILD_ROOT}%{_libdir}/python2.6/site-packages/cloudapis.py %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} @@ -259,7 +279,7 @@ fi %pre management id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \ - -r -s /bin/sh -d %{_sharedstatedir}/cloud/management cloud|| true + -r -s /bin/sh -d %{_localstatedir}/cloud/management cloud|| true # set max file descriptors for cloud user to 4096 sed -i /"cloud hard nofile"/d /etc/security/limits.conf @@ -285,58 +305,67 @@ fi %defattr(-,root,root,-) %doc LICENSE %doc NOTICE -%dir %attr(0770,root,cloud) %{_sysconfdir}/cloud/management/Catalina -%dir %attr(0770,root,cloud) %{_sysconfdir}/cloud/management/Catalina/localhost -%dir %attr(0770,root,cloud) %{_sysconfdir}/cloud/management/Catalina/localhost/client -%dir %{_datadir}/cloud/management -%dir %attr(0770,root,cloud) %{_sharedstatedir}/cloud/mnt -%dir %attr(0770,cloud,cloud) %{_sharedstatedir}/cloud/management -%dir %attr(0770,root,cloud) %{_localstatedir}/cache/cloud/management -%dir %attr(0770,root,cloud) %{_localstatedir}/cache/cloud/management/work -%dir %attr(0770,root,cloud) %{_localstatedir}/cache/cloud/management/temp -%dir %attr(0770,root,cloud) %{_localstatedir}/log/cloud/management -%dir %attr(0770,root,cloud) %{_localstatedir}/log/cloud/agent -%config(noreplace) %{_sysconfdir}/sysconfig/cloud-management -%config(noreplace) %{_sysconfdir}/cloud/management -%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/cloud/management/db.properties -%config(noreplace) %{_sysconfdir}/cloud/management/log4j-cloud.xml -%config(noreplace) %{_sysconfdir}/cloud/management/tomcat6-nonssl.conf -%config(noreplace) %{_sysconfdir}/cloud/management/tomcat6-ssl.conf -%attr(0755,root,root) %{_initrddir}/cloud-management -%attr(0755,root,root) %{_bindir}/cloud-setup-management -%attr(0755,root,root) %{_bindir}/cloud-update-xenserver-licenses -%{_datadir}/cloud/management/* -%attr(0755,root,root) %{_bindir}/cloud-setup-databases -%attr(0755,root,root) %{_bindir}/cloud-migrate-databases -%attr(0755,root,root) %{_bindir}/cloud-set-guest-password -%attr(0755,root,root) %{_bindir}/cloud-set-guest-sshkey -%attr(0755,root,root) %{_bindir}/cloud-sysvmadm -%attr(0755,root,root) %{_bindir}/cloud-setup-encryption -%dir %{_datadir}/cloud/setup -%{_datadir}/cloud/setup/*.sql -%{_datadir}/cloud/setup/db/*.sql -%{_datadir}/cloud/setup/*.sh -%{_datadir}/cloud/setup/server-setup.xml +%dir %attr(0770,root,cloud) %{_sysconfdir}/%{name}/management/Catalina +%dir %attr(0770,root,cloud) %{_sysconfdir}/%{name}/management/Catalina/localhost +%dir %attr(0770,root,cloud) %{_sysconfdir}/%{name}/management/Catalina/localhost/client +%dir %{_datadir}/%{name}-management +%dir %attr(0770,root,cloud) %{_localstatedir}/%{name}/mnt +%dir %attr(0770,cloud,cloud) %{_localstatedir}/%{name}/management +%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management +%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work +%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp +%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management +%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management +%config(noreplace) %{_sysconfdir}/%{name}/management +%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties +%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml +%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat6-nonssl.conf +%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat6-ssl.conf +%attr(0755,root,root) %{_initrddir}/%{name}-management +%attr(0755,root,root) %{_bindir}/%{name}-setup-management +%attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses +%{_datadir}/%{name}-management/webapps +%dir %{_datadir}/%{name}-management/bin +%dir %{_datadir}/%{name}-management/conf +%dir %{_datadir}/%{name}-management/lib +%dir %{_datadir}/%{name}-management/logs +%dir %{_datadir}/%{name}-management/temp +%dir %{_datadir}/%{name}-management/work +%attr(0755,root,root) %{_bindir}/%{name}-setup-databases +%attr(0755,root,root) %{_bindir}/%{name}-migrate-databases +%attr(0755,root,root) %{_bindir}/%{name}-set-guest-password +%attr(0755,root,root) %{_bindir}/%{name}-set-guest-sshkey +%attr(0755,root,root) %{_bindir}/%{name}-sysvmadm +%attr(0755,root,root) %{_bindir}/%{name}-setup-encryption +%{_datadir}/%{name}-management/setup/*.sql +%{_datadir}/%{name}-management/setup/db/*.sql +%{_datadir}/%{name}-management/setup/*.sh +%{_datadir}/%{name}-management/setup/server-setup.xml %{_javadir}/jasypt-1.9.0.jar %{_javadir}/jasypt-1.8.jar -%attr(0755,root,root) %{_bindir}/cloud-external-ipallocator.py -%attr(0755,root,root) %{_initrddir}/cloud-ipallocator -%dir %attr(0770,root,root) %{_localstatedir}/log/cloud/ipallocator +%attr(0755,root,root) %{_bindir}/%{name}-external-ipallocator.py +%attr(0755,root,root) %{_initrddir}/%{name}-ipallocator +%dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/ipallocator %doc LICENSE %doc NOTICE %files agent -%attr(0755,root,root) %{_bindir}/cloud-setup-agent -%attr(0755,root,root) %{_bindir}/cloud-ssh -%attr(0755,root,root) %{_sysconfdir}/init.d/cloud-agent -%config(noreplace) %{_sysconfdir}/cloud/agent -%dir /var/log/cloud/agent -%attr(0644,root,root) /usr/share/cloud/java/*.jar +%attr(0755,root,root) %{_bindir}/%{name}-setup-agent +%attr(0755,root,root) %{_bindir}/%{name}-ssh +%attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-agent +%config(noreplace) %{_sysconfdir}/%{name}/agent +%dir %{_localstatedir}/log/%{name}/agent +%attr(0644,root,root) %{_datadir}/%{name}-agent/*.jar +%attr(0644,root,root) %{_datadir}/%{name}-agent/lib/*.jar %doc LICENSE %doc NOTICE %files common -%attr(0755,root,root) %{_datadir}/cloudstack-scripts/ +%attr(0755,root,root) %{_datadir}/%{name}-common/scripts +%attr(0644,root,root) %{_datadir}/%{name}-common/vms +%attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloud_utils.py +%attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudutils %doc LICENSE %doc NOTICE @@ -349,9 +378,11 @@ fi %doc NOTICE %files cli +%attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudapis.py +%attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudtool/__init__.py +%attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudtool/utils.py %doc LICENSE %doc NOTICE -%{_prefix}/lib*/python*/site-packages/cloud* %files docs %doc LICENSE http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5bf6771e/packaging/centos63/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties index e6efc76..7bdcc1d 100644 --- a/packaging/centos63/replace.properties +++ b/packaging/centos63/replace.properties @@ -26,25 +26,25 @@ COMPONENTS-SPEC=components-premium.xml AWSAPILOG=awsapi.log REMOTEHOST=localhost AGENTCLASSPATH= -AGENTLOG=/var/log/cloud/agent/agent.log -AGENTLOGDIR=/var/log/cloud/agent/ -AGENTSYSCONFDIR=/etc/cloud/agent -APISERVERLOG=/var/log/cloud/management/apilog.log -AWSAPILOG=/var/log/cloud/awsapi/awsapi.log +AGENTLOG=/var/log/cloudstack/agent/agent.log +AGENTLOGDIR=/var/log/cloudstack/agent/ +AGENTSYSCONFDIR=/etc/cloudstack/agent +APISERVERLOG=/var/log/cloudstack/management/apilog.log +AWSAPILOG=/var/log/cloudstack/awsapi/awsapi.log BINDIR=/usr/bin -COMMONLIBDIR=/usr/share/java +COMMONLIBDIR=/usr/share/cloudstack-common CONFIGUREVARS= DEPSCLASSPATH= DOCDIR= -IPALOCATORLOG=/var/log/cloud/management/ipallocator.log +IPALOCATORLOG=/var/log/cloudstack/management/ipallocator.log JAVADIR=/usr/share/java LIBEXECDIR=/usr/libexec LOCKDIR=/var/lock MSCLASSPATH= -MSCONF=/etc/cloud/management -MSENVIRON=/usr/share/cloud/management -MSLOG=/var/log/cloud/management/management-server.log -MSLOGDIR=/var/log/cloud/management/ +MSCONF=/etc/cloudstack/management +MSENVIRON=/usr/share/cloudstack-management +MSLOG=/var/log/cloudstack-management/management-server.log +MSLOGDIR=/var/log/cloudstack-management/ MSMNTDIR=/var/lib/cloud/mnt MSUSER=cloud PIDDIR=/var/run @@ -57,5 +57,5 @@ SYSCONFDIR=/etc/sysconfig SYSTEMCLASSPATH= SYSTEMJARS= USAGECLASSPATH= -USAGELOG=/var/log/cloud/usage +USAGELOG=/var/log/cloudstack/usage USAGESYSCONFDIR=/etc/sysconfig