195 Commits

Author SHA1 Message Date
Rohit Yadav
3652d43cc7 Revert: "Restore the lib directory"
This reverts commit 3b78d6980af4720bd71784471c1b1b8b3dd2f34d.

Conflicts:
	cloud.spec
2012-10-08 23:06:16 +05:30
Rohit Yadav
a52f4462bf CLOUDSTACK-221: Force symlink if any existing symlink
Force symlink, in case there is an existing symlink but the file it
links to does not exist.
2012-10-08 23:06:00 +05:30
Alex Huang
46fd79388c Restore the lib directory 2012-10-08 23:05:47 +05:30
Rohit Yadav
029b9dde86 CLOUDSTACK-221: Add user/group before installing aws-api
Since cloud-client requires aws-api package, and is installed
before aws-api, the patch sets up user/group first.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-08 23:05:32 +05:30
Alex Huang
e63a3b6fa2 More changes 2012-10-08 23:05:21 +05:30
Alex Huang
135f5dcfe9 Fixed more problems with aws
Conflicts:

	setup/bindir/cloud-setup-encryption.in
2012-10-08 00:59:47 -07:00
root
ab26fe7d1e fix build 2012-10-08 00:05:47 -07:00
frank
f03a901e46 CloudStack CLOUDSTACK-257
AWS Api is not correctly deployed

resolved fixed
2012-10-08 00:05:11 -07:00
David Nalley
f3a9a835d3 Removing symlinks for CloudStack-248 and CloudStack-209
The problem that is described in both of those bugs is the deletion of files
installed by cloud-scripts.

What is happening is that instead of fixing the paths to scripts in places
where they are called, we tried to create a symlink in a %post section in
the RPM so that there was a symlink to the new directory for the scripts.
That does work (in new installs) but the problem that arises is that when
RPM is setting up the transation it doesn't know about the symlink (it's
in a %post, the symlinked directory is unowned from RPMs perspective, or
rather it is only owned by the cloud-agent-scripts package, which will
be removed.

So what happens is that cloud-agent-scripts puts things in /foo - we
come along to upgrade to 4.0 and that means we use cloud-scripts -
which puts things in /bar - so we install things into /bar (/foo still
exists at this point) then in a %post (and for the record, RPM doesn't
know what happens in a %pre, %post, %preun, or %postun - they are outside
the transation) we delete /foo and then create a symlink from /foo to /bar.
Then we get to the transaction part where we are ready to remove
cloud-agent-scripts - so it's time to delete /foo - except /foo is now a
symlink to /bar and thus we wipe out the contents of /foo and /bar in one
fell swoop.

To quote Bill Notting from Red Hat who pointed this out:
15:43 < notting> rpm decides what to do with all the files (update, remove,
or write new file) before the transaction. if the directory layout changes
*during* the transaction, weird shit happens.
2012-10-05 16:26:52 -04:00
Rohit Yadav
c6d92f7f90 CLOUDSTACK-248: Fix rpm build for cloud-scripts
Make rpm correctly handle new installs, upgrades and uninstalls.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-10-05 12:01:35 -07:00
frank
595ab41de6 port to master
commit 318d2aedbd0db42d53395a91ca2945db212732d7
Author: frank <frank.zhang@citrix.com>
Date:   Thu Jun 28 16:10:20 2012 -0700

    CS-15376
    Need to change rpm spec to deploy awsapi in its own webapps folder
2012-10-05 10:44:49 -07:00
Marcus Sorensen
635155090a cloud.spec: run modprobe post agent install if kvm.modules exists
Signed-off-by: Edison Su <disheng.su@gmail.com>
2012-09-26 22:06:39 -07:00
Wido den Hollander
6839f7020c rpm: Have cloud-server depend on cloud-scripts 2012-09-26 23:29:47 +02:00
Rohit Yadav
fa63c30576 RPM: Add copyright files to rpms
Adds rule to package toplevel LICENSE and NOTICE files to the doc path.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-26 15:55:42 +05:30
Chip Childers
ded77e7a86 Corrected license of the usage package. 2012-09-25 16:09:30 -04:00
Rohit Yadav
2d832c6cde CLOUDSTACK-189: Fix post install and post uninstall rules
Link over folder, instead of files.
Patch fixes install failure, in case user does not remove old
installation.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-25 11:51:53 +02:00
Rohit Yadav
fb975a98c6 CLOUDSTACK-189: Fix install prefix change for rpms with symlinks
The install prefix for scripts and vms/systemvm.iso/zip has changed
from /usr/lib(32/64)/cloud/agent/ to /usr/lib(32/64)/cloud/common/

Patch fixes by symlinking paths for backward compatibility

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
2012-09-24 12:45:10 +02:00
Edison Su
85505ca755 remove README.html in cloud.spec 2012-09-17 17:42:43 -07:00
Marcus Sorensen
29271a6c84 adding RPM dependency for cloud-agent
adding jakarta-commons-daemon as a dependency for cloud-agent. On fresh install was getting "Cannot find daemon loader
org/apache/commons/daemon/support/DaemonLoader"

Signed-off-by: Edison Su <sudison@gmail.com>
2012-09-14 11:46:09 -07:00
Wido den Hollander
fed7938814 xen: Rename JAR file
cloud-xen.jar does not meet the namespace, so rename it to fit in
2012-09-13 23:19:48 +02:00
Wido den Hollander
7eaf537d95 Rename cloud-agent-scripts to cloud-scripts
The management server also depends on a couple of these scripts, so renaming
to cloud-scripts makes more sence then installing cloud-agent-scripts.

In the future we might want to split this up in two packages.
2012-09-13 16:29:01 +02:00
Wido den Hollander
b892ff6630 Depend on libvirt-java 0.4.9 due to license change
0.4.9 switched from GPL to MIT
2012-09-13 16:29:01 +02:00
Edison Su
5e3921519a CLOUDSTACK-57, CLOUDSTACK-14
remove unnecessary build/deploy folder, and add CAStorSDK-1.3.1-CS40.jar into rpm/deb build system

Conflicts:

	debian/cloud-deps.install
	wscript_build
2012-09-12 20:47:20 -07:00
David Nalley
4b83c7f371 fixing rpm build 2012-09-12 17:51:43 -04:00
Hiroaki Kawai
739d4baf55 Patch from kawai@stratosphere.co.jp to resolve a Fedora dependency issue.
https://reviews.apache.org/r/7009/
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-09-11 10:13:52 -04:00
Edison.Su
52d8849003 fix rpm build 2012-09-10 22:33:41 -04:00
Edison.Su
1aa7a50cf2 fix rpm build 2012-09-10 19:51:16 -04:00
Mice Xia
55980c5338 remove mysql-connector-java.jar from rpm package 2012-09-10 23:37:29 +08:00
Mice Xia
6318e88c7d part of CLOUDSTACK-69 remove hibernate and its dependency from wscript_build and cloud.spec 2012-09-10 23:33:11 +08:00
Mice Xia
0d02e33d31 CLOUDSTACK-69 Hibernate jars should be removed 2012-09-10 21:15:35 +08:00
Rajesh Battala
d9c03a55cf CLOUDSTACK-52 Fix for AWSAPI contains hibernate configurations https://reviews.apache.org/r/6967/diff/
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2012-09-10 17:58:16 +08:00
Chip Childers
d1d9cacbfb CLOUDSTACK-46 : Missed a reference to the mycloud setup script in cloud.spec 2012-09-07 14:43:41 -04:00
Edison Su
b88033ff2a fix installation issue 2012-09-07 05:12:27 -07:00
Edison Su
31bb7b8e56 fix rpm build 2012-09-06 19:19:46 -07:00
Edison Su
f26929bf2d add kvm into rpm 2012-09-06 11:41:01 -07:00
Edison Su
5ae15f8bbf first OSS build 2012-09-05 17:45:25 -07:00
Edison Su
caebc0ce74 fix rpm installation 2012-09-04 22:30:24 -07:00
Edison Su
c4955e82e8 fix rpmbuild 2012-09-04 21:34:52 -07:00
Hugo Trippaers
1f207506da Add an option to select a build with or without non-OSS components using waf 2012-09-04 15:16:18 +02:00
Hugo Trippaers
79004fc7bc Fix RPM build using waf (oss only) and maven. With the exception of awsapi most of the rpms are build. Not the neatest way to do it, but a good base for improvement. 2012-09-04 15:16:18 +02:00
Hugo Trippaers
d18ac73aee Add a dependency to mysql-connector-java to the cloud.spec file for the client package.
Fix some build errors in the spec file
2012-08-31 18:56:23 +02:00
Hugo Trippaers
c657962ece Small fix to add these files to the rpm, this was breaking the waf rpm build (ported from 4.0 branch) 2012-08-20 14:13:25 +02:00
Edison Su
63f47e4ae2 cloud.spec change permissions on /etc/cloud/management
fixes permissions in RPM spec file for varions /etc/cloud/management
files.

RB: https://reviews.apache.org/r/6666/
Send-by: shadowsor@gmail.com
2012-08-16 16:26:19 -07:00
Edison Su
b9e8b5152c Update RPM build for 4.0
Update cloud.spec for current state of 4.0, minor waf and init script
fixes for RHEL/CENTOS/Fedora

RB: https://reviews.apache.org/r/6658/
Send-by: shadowsor@gmail.com
2012-08-16 14:48:28 -07:00
Wido den Hollander
27a43f9a97 agent: Remove dummy.agent.properties
This configuration file isn't being used and would only confuse admins
2012-08-08 22:31:06 +02:00
Chip Childers
42ef767c4a License header updates. 2012-08-02 09:16:16 -04:00
Hugo Trippaers
9c127cf608 Fix rpm build after kvm move 2012-08-02 11:56:33 +02:00
Edison Su
7a0a9231c3 Move KVM related code into plugins/hypervisor/kvm, a new jar file is
created: cloud-kvm.jar
2012-07-30 14:55:47 -07:00
David Nalley
3129d0c8e5 adding jsvc as a dependency in the spec file 2012-07-24 18:11:18 -04:00
Hugo Trippaers
79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00