Commit Graph

77 Commits

Author SHA1 Message Date
Wei Zhou c6e5e0e855 change display name in /etc/init.d/cloudstack-agent from cloud-agent to cloudstack-agent
(cherry picked from commit add6505182)
2013-09-06 14:21:22 +02:00
Prachi Damle a71f41401b Followup fix for CLOUDSTACK-2777, crypto.properties and xes.keystore moved to AWSAPI installation location and changed permission to 666
Conflicts:

	packaging/centos63/cloud.spec
2013-08-19 15:30:40 -07:00
David Nalley fc02f2b038 CLOUDSTACK-3328 Adding a requires for qemu-kvm in cloudstack-agent rpm packaging 2013-07-02 12:09:38 -04:00
Prasanna Santhanam 4797e67d96 CLOUDSTACK-1824: Stop service displayed as cloud-management
service cloudstack-management is being displayed as cloud-management

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 718bc97a7e)
2013-06-25 11:38:59 +05:30
Prasanna Santhanam 7e56b401cf mvn clean does not do a complete clean
Retains the systevm.iso from the previous run causing systemvm.iso to
never update itself. Do a complete clean install for all profiles
specified in mvn.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 55db2fe6d1)
2013-06-22 10:48:41 +05:30
Marcus Sorensen 9a960d88fc RPM build - run mvn clean before building packages, to get a build from fresh source
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1369936033 -0600
(cherry picked from commit 800cd391d5)

Conflicts:
	packaging/centos63/cloud.spec
2013-06-22 10:48:01 +05:30
Hiroaki KAWAI 2dc25df623 CLOUDSTACK-2758: touch file for tomcat6 package change CVS 2013-1976
catalina.out must be prepared by package installation.
This is the same fix in tomcat6 package.

Signed-off-by: Hiroaki KAWAI <kawai@stratosphere.co.jp>
2013-06-07 10:15:14 +09:00
Hugo Trippaers 391bc01a16 CLOUDSTACK-2440 Print a warning if the rpm can't determine the previous configuration for server.xml or tomcat.conf 2013-05-14 12:02:45 +02:00
Hugo Trippaers 1508ef98f0 CLOUDSTACK-2440 RedHat (CentOS) expects a directory with the name of the service to store initd.log 2013-05-13 16:26:00 +01:00
Hugo Trippaers df2e0108ea CLOUDSTACK-2152 Fix rel number, needs to be present 2013-04-23 15:18:40 +02:00
Hugo Trippaers f9c6d01cfb CLOUDSTACK-2152 Set REALVER properly 2013-04-23 14:54:41 +02:00
Marcus Sorensen 73b7fa9d19 Fixing RPM build process for when there isn't a SNAPSHOT in our version number
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-23 00:04:00 +01:00
Wido den Hollander 3cd71354ed CLOUDSTACK-1977: Add management setup directory to classpath
This way the DB upgrade process can locate the SQL files
2013-04-18 21:32:45 +02:00
Wido den Hollander eab23499e5 CLOUDSTACK-2033 Fix usage server logging under Debian and Ubuntu 2013-04-18 10:28:15 +02:00
Hugo Trippaers 2c019cc645 CLOUDSTACK-2033 Fix usage server startup and logging
Properly implement the Daemon interface

Initialize logging when the usage server is started as a daemon

Fix a few minor startup and packaging items.
2013-04-17 01:31:07 +01:00
Hugo Trippaers 1e74c8ae6f Fix a problem where usage server did not start because of a missing db.properties and log4j-cloud.xml 2013-04-17 01:30:55 +01:00
Hugo Trippaers 7ea14cd37e packaging: sync master and 4.1 for rpm packaging 2013-04-05 21:09:55 +02:00
Hugo Trippaers 71d089b9f8 rpm: Install the LICENSE and NOTICE files 2013-04-05 18:53:13 +02:00
Hugo Trippaers fb8ea75707 packaging: Three times is a charm
Sorry about this, my packaging test system is out of order :-(
(cherry picked from commit 171a967437)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-04-05 17:20:02 +02:00
Wido den Hollander bfc8ffcd27 debian: Update the cloudstack-management server's classpath
It should contain /etc/cloudstack/management so it can locate it's configuration
2013-04-05 17:16:54 +02:00
Hugo Trippaers 76438b825c packaging: spark404 should test his commits
(cherry picked from commit 09f278f909)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2013-04-05 16:45:07 +02:00
Hugo Trippaers 72640a85ee Packaging: db-enc.properties is gone 2013-04-05 16:16:36 +02:00
Wido den Hollander 9ba29f3d3e Remove db-enc.properties
This seemed to be used with Ant, but there is no other reference to this file.

It shouldn't be here and isn't used. It only confuses people.
2013-04-05 16:16:27 +02:00
Hugo Trippaers 7cbd8f581f packaging: move jasypt jar to cloudstack-common
Continuation of the work done in a35f7c7bd1
2013-04-05 16:08:11 +02:00
David Nalley 0ef3e6dd5a CLOUDSTACK-1936 add cloudstack-agent as a service 2013-04-04 14:46:51 +01:00
Marcus Sorensen b86b1d9250 CLOUDSTACK-1900 : Save a default db.properties during upgrade, and make sure
we only pull the old configs once.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1364966964 -0600
2013-04-03 14:44:40 +01:00
Wido den Hollander 11892d34d7 debian: Various packaging fixes from master
This commit includes various packaging fixes already in master.
2013-03-31 15:31:15 +02:00
Pradeep fa47d30866 CLOUDSTACK-1689: KVM agent install.sh should install ipset command
Added ipset in cloud.spec as part of agent install.

Signed-off-by: Pradeep <pradeep.soundararajan@citrix.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-29 16:38:55 +05:30
Marcus Sorensen 260f6f7e5d CLOUDSTACK-1844 - fix typo in agent pre-script to allow copy of old configs
to new config location

Reported-by: Sangeetha Hariharan (JIRA)
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1364522608 -0600
2013-03-29 10:20:47 +05:30
Marcus Sorensen 0f8320095c Summary: RPM - recover configs during upgrade
Detail: Uninstallation of old RPMs wipes out some of the configs, and makes it
difficult to reapply existing configs. This change moves the config directory
to cloud.rpmsave, and then pulls in necessary files from that location during
post install of agent and management server.

Test passed:
install 4.0 RPMs, set up advanced zone
build 4.1 RPMs via package.sh, with this patch
install 4.1 RPMs
restart cloudstack-management, cloudstack-agent
verify management, agent, and zone is operational

BUG-ID: CLOUDSTACK-1694
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1364409632 -0600
2013-03-27 18:47:48 +00:00
Pradeep Soundararajan e46601463c BUG-ID: CLOUDSTACK-1713, CLOUDSTACK-1719
Summary: EC2 REST API: AWS APIs are not getting translated on the CloudStack Management Server and AWS API Installation Problems.

Fixing the class not found exception, key not found and other issues as mentioned in the above two defects.

Signed-off-by: Pradeep <pradeep.soundararajan@citrix.com>
2013-03-26 13:25:57 +00:00
Pradeep 8d3a7f29b8 BUG-ID: CLOUDSTACK-1252 Summary: Failed to download default template in VMware
Proposing to modify the behaviour of package.sh script. Package as per OSS or NONOSS arguments.

Signed-off-by: Pradeep <pradeep.soundararajan@citrix.com>
2013-03-25 17:32:28 +00:00
Brian Spindler 4d853d7d41 CLOUDSTACK-1736: Changes required to get cloudstack-management service
working again.

The newly created package for cloudstack-management was not correctly
installing the service. This prevented cloud-setup-management from being
able to configure the service, and the init script didn't even believe
the service was installed. I also added sudo to the chmod command for
checking script permissions, as most scripts belong to root. It was
trying to configure the agent with cloudstack-setup-agent but the script
was still called cloud-setup-agent, so I renamed it to cloudstack-setup-agent.
2013-03-25 17:24:44 +00:00
Pradeep Soundararajan 88b750c8e4 CLOUDSTACK-1713 and CLOUDSTACK-1719: AWSAPI packaging fixes
Summary: EC2 REST API: AWS APIs are not getting translated on the
CloudStack Management Server and AWS API Installation Problems.
This fixes the above two defects and other packaging related issues.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-03-21 00:38:59 +00:00
Wido den Hollander df81898838 CLOUDSTACK-1469: Include JNA in the classpath when starting the Agent
This should have been already merged into 4.1, but didn't come through properly.

We use the JNA version shipped with CentOS 6.X since that works best with
libvirt 0.4.9
2013-03-20 15:52:14 +01:00
Pradeep Soundararajan d20bcce7a2 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>
2013-03-19 13:09:20 -04:00
Wido den Hollander 8d333ec664 CLOUDSTACK-1415: Merge in the Debian/Ubuntu packaging work from master
This patch inclused the packaging work from master tailored for 4.1

Not everything has been tested yet, but it should generate DEB packages.

Signed-off-by: Wido den Hollander <wido@42on.com>
2013-03-14 21:02:30 -04:00
Marcus Sorensen 996b57a42d CLOUDSTACK-1651 - point agent scripts to correct logging location, due to move
of /var/log/cloud to /var/log/cloudstack

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1363112422 -0600
2013-03-12 15:03:12 -04:00
David Nalley 88843c00d1 CLOUDSTACK-1630 - Actually put obsoletes in the right order 2013-03-12 11:35:34 -04:00
Pradeep 4f071bcdf8 Adding awsapi in the require section of cloud.spec as it resolves issue with EC2 QUERY API Feature.
Moved the post awsapi section to the post management since it is trying to provide symb link before installing management server.

Signed-off-by: Pradeep <pradeep.soundararajan@citrix.com>
2013-03-12 09:25:24 -04:00
David Nalley b65868d3ae CLOUDSTACK-1630 - awsapi package not obsoleted, which blocked upgrades 2013-03-11 20:41:18 -04:00
David Nalley 0dc0aefd82 CLOUDSTACK-1631 - removing duplicate %doc declarations in -management 2013-03-11 20:31:58 -04:00
Marcus Sorensen a1cbf57ca0 CLOUDSTACK-1201 - Fix update to cloud user's home dir on mgmt
server. It was printing a meaningless failure if the cloud
    user's home dir didn't need to be updated.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1362809648 -0700
2013-03-09 12:00:47 +05:30
Marcus Sorensen 97f8705610 Summary: Update cloud user's home dir during RPM install for 4.1+
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1362185206 -0700
2013-03-02 14:04:41 -05:00
Hugo Trippaers 53e58f0501 CLOUDSTACK-1469 Commit 2f135be1 introduced jna as a dependency for hypervisor kvm, so make sure the version from the operating system is not used anymore
(cherry picked from commit 6223520efd)

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-03-01 14:58:04 +01:00
Noa Resare 0518e456ce rpm packaging fix: Add symlink for log4j-cloud.xml in client webapp
web.xml now references a log4j-cloud.xml relative to the webapp root
to capture early logging from spring.  This change introduces a symlink
in the client webapp to the system wide log4j-cloud.xml which works around
a problem starting cloud-management described in CLOUDSTACK-1436

CLOUDSTACK-1436: 4.1 management server fails to start from RPM...
CLOUDSTACK-1423: Unable to launch UI [HTTP Status 404 - ]

Signed-off-by: David Nalley <david@gnsa.us>
2013-02-28 19:36:33 +00:00
Marcus Sorensen e2a16a12f9 Summary: Fix RPM installation error for cloudstack-awsapi
Detail: getting "hard link not allowed for directory" due to line 321 in
cloud.spec. Changing to symlink.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1361982798 -0700
2013-02-27 09:33:18 -07:00
Noa Resare 78e8d18428 CLOUDSTACK-1415: Debian & Ubuntu packaging work
Some concepts included:

* the replace.properties location used by maven is parameterized to allow
  for a build that does not modify the currently git tracked files
* package naming is updated along the lines of what was discussed on the
  -dev mailing list and between committers at the Build a Cloud Day in Belgium.
* package version pattern is updated (since we redo all package names,
  we might as well drop the epoch)
2013-02-27 15:38:55 +00:00
Hugo Trippaers 62d7dc9d37 Summary: Packaging fixes for usage
Make the usage server look in the /etc/cloudstack/usage server for the db.properties

Add the /etc/cloudstack/usage to the package as an empty dir
(cherry picked from commit d92725e846)

Separate stderr and stdout output from jsvc
(cherry picked from commit 0fa3ed9b74)

Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-02-26 20:26:37 +01:00
Ricardo P. Katz 69370c181f packaging: vhd-util message corrected
Change on cloud.spec for the message about vhd-utils point to the new
location of cloudstack scripts

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-26 11:40:27 +05:30