240 Commits

Author SHA1 Message Date
David Amorim Faria
adb0d3bb74 CLOUDSTACK-9065: fix bug when creating packaging with noredist flag 2015-11-25 01:41:22 +01:00
David Amorim Faria
e66dd8c1e0 Refactor package.sh:
* lint
 * adjust exit codes (1 for usage, 2 for maven, 3 for rpmbuild)
 * variable naming consistency
 * add option for package release version
 * revise synopsis and usage
2015-11-16 19:30:25 +01:00
Remi Bergsma
ee639cffe4 Merge pull request #1052 from davidamorimfaria/centos7-packaging
CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libsCLOUDSTACK-9049: Fix Centos7 with Tomcat7 packaging and python libs

* pr/1052:
  CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libs * adjust library to support tomcat7 config files * adjust centos7 spec to use tomcat7 config files from deployment * add option to use tomcat7 files in management server setup
  reorder content to match original

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-11-10 13:30:55 +01:00
David Amorim Faria
3c4a24cf2c CLOUDSTACK-9049: fix Centos7 with Tomcat7 packaging and python libs
* adjust library to support tomcat7 config files
* adjust centos7 spec to use tomcat7 config files from deployment
* add option to use tomcat7 files in management server setup
2015-11-10 11:55:19 +01:00
David Amorim Faria
c84bb6b725 reorder content to match original 2015-11-10 08:38:59 +01:00
Boris Schrijver
7bbc5338c5 CLOUDSTACK-9045: Corrected mount point for management server DEBIAN. 2015-11-08 20:38:47 +01:00
Remi Bergsma
acce645119 Merge pull request #1008 from davidamorimfaria/master
CLOUDSTACK-8812 / CLOUDSTACK-9010: adjust packaging for centos7

Here are a few adjustments for the packaging in centos7. With these changes I was able to start the service. Please review. Thank you.

* pr/1008:
  CLOUDSTACK-9010: adjust packaging for centos7

This closes #888

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-10-31 11:55:06 +01:00
David Amorim Faria
be75b7f44c CLOUDSTACK-9010: adjust packaging for centos7
* Adjust systemd service to match tomcat7 startup,
   and change service type to simple.

 * Adjust sysconfig to only have one JAVA_OPTS
   due to behaviour change in tomcat7.

 * Adjust spec to remove some config files
   from WEB-INF since they are placed in /etc.
   This is a similar behaviour to the centos6 spec.
2015-10-31 08:47:15 +01:00
Rohit Yadav
909df859b3 CLOUDSTACK-9000: logrotate cloudstack-agent out and err logs
Adds logrotate rules for cloudstack-agent.{err,out} log files

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-10-28 17:17:03 +05:30
Sudhansu
734e42d2b2 CLOUDSTACK-8815 : Issues with cloudstack-management init script
instead of using basename use target file.
2015-09-28 17:31:07 +05:30
Wido den Hollander
a5ca762acb Merge pull request #820 from wido/CLOUDSTACK-8840
CLOUDSTACK-8840: Systemd service for the Usage ServerThere already was a uncompleted systemd service file for the Usage
Server.

This new one replaces sysvinit and the old systemd service file.

* pr/820:
  CLOUDSTACK-8840: Do not include old systemd wrapper
  CLOUDSTACK-8840: Fix the source path of the service file
  CLOUDSTACK-8840: Systemd service for the Usage Server

Signed-off-by: Wido den Hollander <wido@widodh.nl>
2015-09-17 10:09:58 +02:00
Wido den Hollander
0204269b96 CLOUDSTACK-8840: Do not include old systemd wrapper 2015-09-16 13:59:52 +02:00
Wido den Hollander
2c143543b5 CLOUDSTACK-8840: Fix the source path of the service file 2015-09-15 09:33:17 +02:00
Wido den Hollander
f44a5c79b3 CLOUDSTACK-8840: Systemd service for the Usage Server
There already was a uncompleted systemd service file for the Usage
Server.

This new one replaces sysvinit and the old systemd service file.
2015-09-14 13:30:32 +02:00
Wido den Hollander
df53776d4e CLOUDSTACK-8625: Remove the need of a wrapper script for the Agent
We now inline execute 'sh' which does all the work
2015-09-14 13:15:39 +02:00
Wido den Hollander
4b3a8415b3 CLOUDSTACK-8625: Updated spec file for systemd profile 2015-09-13 22:07:09 +02:00
Wido den Hollander
94b60be407 CLOUDSTACK-8443: Install the systemd wrapper script in RPM 2015-09-13 15:41:13 +02:00
Wido den Hollander
612c7ebf40 CLOUDSTACK-8625: Systemd profile for CloudStack Agent
With CentOS 7 and Ubuntu 16.04 (to be released) using systemd
it is preferred that CloudStack's Agent is also being started using
systemd.

This commit includes a service file for the CloudStack Agent with
a wrapper script which actually executes Java

It no longer uses jsvc for daemonizing and thus this requirement
has also been dropped for CentOS 7 packaging.

The Agent log output to stdout has also been modified to no longer
include the timestamp as this is done by journalctl.

This has been tested on a CentOS 7.1 machine and the Agent starts,
stops and restarts properly.
2015-09-13 15:12:29 +02:00
sanjeev
87e53eae53 CLOUDSTACK-8633: Changing file permissions from 755 to 440
Reviewed-By: Raja

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #591
2015-07-15 18:08:08 +05:30
Rafael da Fonseca
870e1898eb Use same sudoers config for all distros Cleanup buggy code for sudoers file editing
Signed-off-by: Daan Hoogland <daan@onecht.net>

This closes #332
2015-06-19 16:00:57 +02:00
pdion891
23c990f7c9 fix centos63 build in master. not working since removal of awsapi
Signed-off-by: pdion891 <pdion891@apache.org>
2015-05-31 21:50:32 -04:00
Rafael da Fonseca
1958a8e9c1 Cleanup awsapi leftovers
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This closes #328
2015-05-29 19:15:51 +02:00
Rohit Yadav
e752f88991 CLOUDSTACK-8339: Include profile script in rpm packaging that fixes PATH
Normal users would require /sbin in their paths to access lsmod, this adds
a profile.d script that adds /sbin, for centos7, f20 and f21 packages.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-25 14:40:50 +02:00
Rohit Yadav
e5d3084526 CLOUDSTACK-8339: Allow non-root users to add KVM host
This allows non-root users to add KVM hosts, the user should be an admin or
added to sudoers to execute sudo cloudstack-setup-agent.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Signed-off-by: Remi Bergsma <apache@remi.nl>

This closes #288

(cherry picked from commit d2b0c1a32b2d8719eafd6d4574de9a824d46d290)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-25 14:36:29 +02:00
Daan Hoogland
2fbccf1c3f removed undefined packaging macros 2015-05-25 12:21:38 +02:00
Daan Hoogland
1c408dec37 Merge branch '4.5' after 4.5.1 vote passes 2015-05-07 16:03:26 +02:00
Rohit Yadav
58999daafe CLOUDSTACK-8433: remove awsapi rpm and debian packaging
- Removes awsapi packaging rules for debian, centos63, centos7, fedora 20/21
- Removes catalina port 7080 service configs
- Fixes build replace properties for AWSAPILOG
- Removes maven profile for building awsapi and deploying db in developer profile

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 15:22:04 +02:00
Rohit Yadav
bb86d03601 CLOUDSTACK-8433: remove awsapi and awsapi-setup
Following actions from discussions on dev ML regarding removing awsapi and
prefering ec2stack. Reference from last PR:
https://github.com/apache/cloudstack/pull/44

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 15:22:04 +02:00
Rohit Yadav
25e555bd2d packaging: rpm related fixes
CLOUDSTACK-7460: mgmt server package should not create agent directory
Revert "CLOUDSTACK-8402: Depend on openjdk 1.7 for both CentOS 6 and 7"
Revert "CLOUDSTACK-8404: uninstall/conflict if java-1.8.0-openjdk is installed"

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 01:46:21 +02:00
Rohit Yadav
3ac3534544 Revert "CLOUDSTACK-8402: EL7 rpms should depend on openjdk7"
This does not fail on centos7, reverting the fix.

This reverts commit 52a0adad04d67555a50ab58662735039f438c7e0.
2015-05-06 01:43:35 +02:00
Rohit Yadav
8f25be7c0f CLOUDSTACK-8404: uninstall/conflict if java-1.8.0-openjdk is installed
This would force to uninstall openjdk 1.8.0 and only install 1.7 in case of ACS
4.5.x releases. On master/4.6, we might support java 1.8.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:04:33 +02:00
Rohit Yadav
031d7a9c43 CLOUDSTACK-8402: Depend on openjdk 1.7 for both CentOS 6 and 7
This commit forces rpms to depend on java-1.7.0-openjdk which is available
on both CentOS 6 and CentOS 7, also the version that ACS 4.5 supports.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-04-29 16:50:40 +02:00
Rohit Yadav
52a0adad04 CLOUDSTACK-8402: EL7 rpms should depend on openjdk7
Depend on java-1.7.0-openjdk for EL7 rpms as agent fails with openjdk8. This
fix needs to be reverted/removed to use openjdk8 once we start supporting it.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-04-29 16:49:25 +02:00
Satoru Nakaya
07c30895bb fix CLOUDSTACK-8402
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #205
2015-04-29 09:15:28 +05:30
Rohit Yadav
65a91c5bff packaging: add net-tools dependency on kvm agent
net-tools packages installs ifconfig on centos systems that don't have it
like centos7.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-04-14 16:46:22 +05:30
Rajani Karuturi
16806b19a0 reverted 555c4329462ac632890c7cde3bac8db8b6e8a682 for centos6.3 as the rpm installs java 1.6 2015-04-02 14:57:29 +05:30
Rohit Yadav
d70937aeb9 centos63: depend on java 1.7.0+ not java7 for packages
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-20 15:42:14 +05:30
Pierre-Luc Dion
304116623b removing previously added java.security.ciphers for add distro 2015-03-19 15:36:45 -04:00
Pierre-Luc Dion
dc8ab6057f fix centos7 rpm build, file misplaced 2015-03-19 10:16:20 -04:00
Pierre-Luc Dion
8d4f5b914e fix build for rpm packages due to missing file java.security.ciphers 2015-03-19 09:28:36 -04:00
Rohit Yadav
d7b4a1d843 packaging: install java.security.ciphers in rpms
This fixes rpm build failure

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-19 14:49:59 +05:30
Rohit Yadav
d1d486cbeb centos63: include java.security.ciphers when packaging rpms
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-19 14:45:37 +05:30
Harikrishna Patnala
ac1a2207ef CS-17504: Weak SSL ciphers supported by the management server
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 20a63c409d52b2c3dffc8ea58dd25ffb7e55d0e8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	packaging/centos63/cloud.spec
2015-03-13 15:02:27 +05:30
Harikrishna Patnala
f947fad197 CS-17504: Weak SSL ciphers supported by the management server
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 13:25:33 +05:30
Star Guo
b108648f65 CLOUDSTACK-7951: Limit amount of memory used by cloudstack-agent jsvc
This closes #111

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-11 16:45:05 +05:30
Star Guo
555c432946 fix yum install require java => 1.7.0 when build management agent and usage rpm package
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #108
2015-03-11 09:35:00 +05:30
Laszlo Hornyak
a0eb144987 packaging: date fix
rpmbuild complained about the date "Fri Oct 03 2012"
according to the calendar, Oct 3 2012 was Wednesday

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-03-02 02:08:17 +01:00
ghxandsky
eaf734915f Fix cloud.spec for building management rpm, need not create agent dir but agetn rpm (kvm host agent) 2015-02-26 23:51:43 +08:00
ghxandsky
b6d9163ae2 Add distribution fedora21 in packaging/package.sh 2015-02-26 22:54:04 +08:00
Laszlo Hornyak
a9912a00b8 packaging for fedora 21
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-21 22:44:40 +01:00