Commit Graph

144 Commits

Author SHA1 Message Date
Rohit Yadav 0671a80972
Merge pull request #1621 from milamberspace/FixPR1610_addLineReturn
[CLOUDSTACK-9444] Fix a little issue from PR1610 if the db.properties file hasn't EOL character at the end of file

And some improvements about the dir/file using variables

cc @wido @rhtyd

* pr/1621:
  Fix a little issue from PR1610 if the db.properties file hasn't EOL character at the end of file And some improvements about the dir/file using variables

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-08-30 18:32:09 +05:30
Milamber 6051fa503a Fix a little issue from PR1610 if the db.properties file hasn't EOL character at the end of file
And some improvements about the dir/file using variables
2016-08-30 08:29:06 +01:00
Rohit Yadav d6e904520b Merge branch '4.8' into 4.9 2016-08-24 13:04:25 +05:30
Rohit Yadav 8cd44b1684 CLOUDSTACK-9467: Add symlink to key file for usage server
On fresh installation, the usage server fails to start if the `key` file does
not exist in its classpath. The issue is reproducible in environments where
the usage server is installed before cloudstack-setup-databases has been called.
Before the cloudstack db has been setup, the key file does not exist at its
default location and installation of usage-server fails to add a symlink to the
key file.

This fix adds a default symlink to `/etc/cloudstack/management/key` if a
symlink/file does not already exist in the /etc/cloudstack/usage directory.

On new installation, in the post-installation steps it checks if the symlink
or file exists, and adds a symlink if it does not exist. On existing
installations, if symlink or file exists then it will skip adding symlink.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-08-23 17:20:41 +05:30
Rohit Yadav 7b8ba24c64 CLOUDSTACK-9452: add python-argparse dependency on el6,7 rpms
The patchviasocket script was rewritten in Python from PR #1533 and made
assumptions that Python 2.7 would be available. In case of CentOS, python 2.7
may not be available or installed. This change ensures that python-argparse
is installed which is used by this script.

Expose cmd error in the logs when patch command fails.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-08-10 16:25:17 +05:30
Rajani Karuturi c03d035c8b Merge release branch 4.8 to 4.9
* 4.8:
  server: give more memory to tests
  packaging: Marvin and integration-tests packages
2016-08-05 14:30:45 +05:30
Rohit Yadav de041df74d packaging: Marvin and integration-tests packages
This introduces two new cloudstack packages: marvin and integration-tests.
The two packages will make it easier for CI systems to install Marvin for a
specific cloudstack release/build and run integration tests that are specific
for that version/build.

- maven: add explicit juniper-contrail-api maven repository
- marvin: build source distribution for both install and package mvn phases

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-07-20 16:31:23 +05:30
Wido den Hollander 343ea6098e
packaging: Add db.X.driver=jdbc:mysql to db.properties on upgrade
This is required afther the upgrade to 4.9.0 and for convience we
add this to the configuration so our users do not have to.
2016-07-12 10:13:23 +02:00
Rohit Yadav 20638caaa4 packaging: don't bundle systemvm.zip in rpms
Removes bundling of systemvm.zip in cloudstack-common rpms. This is not
done in debian packaging either there we remove for rpms as well, as this
file is not used by any subsystem but systemvm.iso is used.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-05-19 10:12:48 +05:30
Rohit Yadav 07dcac7373 packaging: backup commands.properties as it does not exist in new rpms
In case of rpms, the commands.properties file is bundled at
/usr/share/cloudstack-management/webapps/client/WEB-INF/classes/commands.properties

In case of a rpm upgrade, new rpms won't ship with commands.properties file. For
existing installations this copies the commands.properties file to
/etc/cloudstack/management

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2016-05-19 09:56:46 +05:30
Paul Angus 11e3582fdf Remove extraneous log directory and add catalina.out log rotation 2016-05-12 08:41:39 +01:00
Wido den Hollander 92e3ba2053 CLOUDSTACK-8818: Use MySQL native connector with Python
MySQLdb has been deprecated and is also not supported in Python 3.

mysql.connector is a connector written in Python which talks the
native MySQL protocol without any external code.

https://dev.mysql.com/doc/connector-python/en/
2016-05-04 23:28:52 +02: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
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 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 d2b0c1a32b)
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 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 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
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 555c432946 for centos6.3 as the rpm installs java 1.6 2015-04-02 14:57:29 +05:30
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 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
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
Rohit Yadav c78d3416e7 Revert "Revert "CLOUDSTACK-7671: Management server restart failed after reboot""
This reverts commit e2ca6e38d5.
2015-02-19 14:55:31 +05:30
Rohit Yadav 240e8ef8ac packaging: fix rpm package warning, fix day/date
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f702097b3e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 07:49:19 +05:30
Rohit Yadav f702097b3e packaging: fix rpm package warning, fix day/date
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-01-20 07:48:26 +05:30
Rohit Yadav 752980f370 Revert "packaging: updated hardcoded jasypt version to 1.9.2"
This reverts commit 43f39a1ec3.
2014-12-04 19:47:10 +05:30
Rohit Yadav 518853ab43 packaging: updated hardcoded jasypt version to 1.9.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 43f39a1ec3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 04:04:30 +05:30
Rohit Yadav 43f39a1ec3 packaging: updated hardcoded jasypt version to 1.9.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-12-04 04:02:46 +05:30
Hugo Trippaers 870ede5a04 Add improved support for packaging CloudStack for CentOS 7 2014-11-24 18:14:26 +01:00
Rohit Yadav 5107472a01 CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a18d067278)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-13 17:48:56 +05:30
Rohit Yadav a18d067278 CLOUDSTACK-6892: use lowercase noredist, as package.sh lowercases build type
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-13 17:48:11 +05:30
rayeesn dfdf9edd52 updated packge scripts to support simularot rpm build
(cherry picked from commit f96c65416a)
2014-10-13 00:35:31 -04:00
Nitin Mehta a516e5d224 Revert "CLOUDSTACK-7671: Management server restart failed after reboot"
This reverts commit e8f1c59212.

(cherry picked from commit e2ca6e38d5)
2014-10-13 00:33:58 -04:00
Damodar 7bea2f7098 CLOUDSTACK-7671: Management server restart failed after reboot
(cherry picked from commit e8f1c59212)
2014-10-13 00:30:41 -04:00
rayeesn f96c65416a updated packge scripts to support simularot rpm build 2014-10-08 10:11:08 -07:00
Nitin Mehta e2ca6e38d5 Revert "CLOUDSTACK-7671: Management server restart failed after reboot"
This reverts commit e8f1c59212.
2014-10-07 13:30:40 -07:00
Damodar e8f1c59212 CLOUDSTACK-7671: Management server restart failed after reboot 2014-10-07 15:01:40 +05:30
Damodar 51e0488e5c CLOUDSTACK-7316: Usage Server is not getting started when we install it on management server. This is happening when encryption is enabled. For usage server it is not able to get key file in the classpath. 2014-09-02 15:13:45 +05:30
Damodar 7ea7deded0 CLOUDSTACK-7106 : RPM build failing with RHEL7 Reviewed By : Rayees
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-08-26 11:04:48 +05:30
Rohit Yadav 28ad34e31e CLOUDSTACK-7038: Add mysql client dependency for mgmt server, rpms and debs
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6a26e77514)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-08-20 12:17:34 +02:00