Commit Graph

79 Commits

Author SHA1 Message Date
Chiradeep Vittal 271d232d62 QuickCloud: we moved the SecondaryStorageDiscoverer from the com.cloud package to the org.apache.cloudstack package
QuickCloud: fix license issue
QuickCloud: use a different activation for deploying quickcloud
Otherwise marvin gets invoked during mvn install -Dquickcloud
2013-04-09 14:45:27 -07:00
Chiradeep Vittal 5ff8bcaa2e QuickCloud: when using SSVM, pass in the new name of the SS class (com.cloud -> org.apache.cloudstack)
QuickCloud : configuration moved to applicationContext.xml from componentContext.xml
QuickCloud: default to enabled state for devcloud zone
QuickCloud: environment.properties helps customize location of pid file
2013-04-09 14:45:26 -07:00
Chiradeep Vittal c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal a806ce43d3 QuickCloud: allow specification of network offering name in datacenter config. The deployDatacenter python script will use this to pick the network offering during creation of the default network in a basic zone 2013-04-09 14:45:26 -07:00
Chiradeep Vittal e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00
Rohit Yadav 80d58b6c73 CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
Gavin Lee 07102fc8ab CLOUDSTACK-1318:Fix build devcloud issue 2013-02-19 23:22:16 +08:00
Prasanna Santhanam a4510efc24 maven: parent pom of tools/* projects is tools/pom.xml
Fixes broken builds for tools

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-18 10:26:49 +05:30
Prasanna Santhanam 05437d0e97 maven pom: put apache cloudstack tools together in umbrella pom
minor pom refactor to put all the tools under one placeholder pom.
Also adds a profile for marvin to run deployDataCenter via mvn options.

$mvn -Pdeveloper,marvin -pl :cloud-marvin -Dmarvin.config=<path/to/config>

OR
$cd tools/marvin
$mvn -Pmarvin -pl :cloud-marvin -Dmarvin.config=path/to/config

will deploy the datacenter using the marvin.config property's value

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-02-15 20:53:41 +05:30
Rohit Yadav 733ec50d46 maven: don't use process-test-resources lifecycles, target are skipped if test are
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-12 12:17:25 +05:30
Chip Childers ebe738ee20 CLOUDSTACK-1233: Fixed veewee config file legal documentation
The veewee configuration files used for the devcloud base-box build, as
well as the newly introduced files used to create a system vm, were
inappropriately identified as ASLv2 licensed and copyrighted by the ASF.

The fixes:
- The ASF headers stripped to match the source.
- The files are now excluded from RAT checks in the root pom.
- The tools/whisker/descriptor.xml file updated
- The root LICENSE and NOTICE were re-generated

Changes in the Apache Whisker templates for LICENSE and NOTICE files
caused a good bit of whitespace oddness in this commit for those 2
files.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-02-11 21:40:06 -05:00
Rohit Yadav 356866c72b Merge branch 'master' into javelin
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:18:53 -08:00
Rohit Yadav 7b11b71d81 maven: create dependency, deploydb on developer first and then on devcloud
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit afb2770012)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:32:57 -08:00
Rohit Yadav 1a695b84b4 tools: Fix devcloud artifact name, avoid confusion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:32:51 -08:00
Rohit Yadav afb2770012 maven: create dependency, deploydb on developer first and then on devcloud
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:30:35 -08:00
Rohit Yadav a736f6b44f tools: Fix devcloud artifact name, avoid confusion
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 16:19:45 -08:00
Chip Childers 45d21c3202 Devcloud config for basic zone + management server.
Added a devcloud config that supports having the management
server run within devcloud, using the basic zone setup.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-22 16:44:34 -05:00
Rohit Yadav 22e70f2c8e devcloud: Update a working p.a.o url in devcloud.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 10:55:05 -08:00
Alex Huang 10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Marcus Sorensen 354c56a988 Summary: Adding apache license headers to various devcloud configs
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358284904 -0700
2013-01-15 14:21:44 -07:00
Marcus Sorensen 0412cb8d92 Summary: Edit devcloud cfg files for advanced networking, add comments 2013-01-15 02:16:25 +00:00
Marcus Sorensen e97090a920 Summary: Updated devcloud-advanced.cfg and devcloud-kvm-advanced.cfg
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358208922 -0700
2013-01-14 17:15:22 -07:00
Marcus Sorensen 9139949d96 Summary: Adding devcloud-advanced.cfg marvin config for advanced network testing
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358193432 -0700
2013-01-14 12:57:12 -07:00
Alex Huang 30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
James Martin 7c56a81bdd devcloud: Fixed regression for network.conf commit 97fe053e2e
Fixes regression for network.conf, commit:
commit 97fe053e2e
Author: Chip Childers <chip.childers@gmail.com>
Date: Mon Aug 13 11:12:01 2012 -0400

Removed ASF license header from network.conf, because XCP doesn't respect comment lines in this file

This seemed to have been re-introduced during the merge in of my patch.  This file has no been removed
completely and is created in-line through the puppet module.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-17 13:16:32 -08:00
James Martin 0661f9b814 Added fix to force apt to do a "apt-get update" before packages are installed.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-16 12:29:49 -08:00
Rohit Yadav be6acc719a rat: Apply missing license for devcloud puppet file
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 23:41:00 -08:00
Rohit Yadav 89dc874f6f rat: Fix license on recently added new files in tools/devcloud
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 22:23:09 -08:00
Rohit Yadav eddb3dfc92 devcloud: Move build scripts to src/, fix README and rm Gemfile.lock
- Move build scripts to src/
- Fix README.md
- Remove and ignore Gemfile.lock
- Fix tabs in boxer.sh
- Move to src/

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:39 -08:00
James Martin e46aa61068 Removed starting of cloudstck from buildcloudstack
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:39 -08:00
James Martin 6d22df9256 Added script for starting cloudstack. Added python-mysql.connector package. renamed script to buildcloudstack.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:39 -08:00
James Martin 355df8affb made Vagrantfile headless again. puppet manifests now (mostly) pass puppet-lint tests.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin 069b8507f3 Adding info.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin 4367497000 Updated readme.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin a990f7abe4 Successfully building devcloud now. Added option in params.pp for compiling cloudstack or not. moved ebtables stuff to devcloudinitial update build scripts in builddevcloud.sh.erb
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin 7340433e51 Iptables file must be puppeted in the xenbox stage so it exists when the network is started in the devcloud phase.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin 0555b79e8d Updated to suppor 2 nics.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin 7902a69872 Change interfaces as per devcloud2
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin f55c230d89 Updated readme, adding rvmrc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin 791bf3c242 Default source should be devcloudbase-xen. Source "devcloud" only used when importing a successfully built devcloud.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:38 -08:00
James Martin b996aff418 Merge in of cleanup work.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-14 19:36:37 -08:00
Rohit Yadav 51a5919be1 devcloud: fix configuations for default devcloud.sql
Patch moves config. info from cfg file to .sql file. Adds more options so DevCloud
can run on host-only IPs and cidr.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-28 23:32:31 -08:00
Rohit Yadav af12a25a60 devcloud: Update IP as per new DevCloud appliance
The new DevCloud nic (host-only) IP is 192.168.56.10 by default

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-27 18:15:24 -08:00
Rohit Yadav c68c7e2a2d devcloud: Fix default template url and deploydb error
- Fix the default builtin template url. The previous url is not reachable by
  public network.
- Remove INSERT statement which already gets inserted in cloud.configuration
  by mvn -P developer -Ddeploydb

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-29 19:05:46 +05:30
Edison Su b57be3389e add apidocs/devcloud projects 2012-10-21 00:01:47 -07:00
Edison Su f6ac4dbe5d fix some pom xml files indentation, add db.root.passowrd, add utils/conf/db.properties.override, add to create user cloud, add devcloud pom file
Conflicts:

	pom.xml
2012-10-19 15:27:19 -07:00
Prasanna Santhanam c86c5d2cc0 Uniting all the READMEs from tools and test
There are various READMEs under Cloudstack. This makes it confusing for
finding the purpose of each directory and tool within the project. All
the necessary information can now be found in the top-level README.tools
that is markdown editable. For the most updated information however it
is best to provide a wiki link to the tool you have added. Each tool
lies in a seperate section, please keep formatting unchanged.
2012-10-12 17:01:20 +05:30
Edison Su 93024c8104 fix some pom xml files indentation, add db.root.passowrd, add utils/conf/db.properties.override, add to create user cloud, add devcloud pom file 2012-10-09 01:14:32 -07:00
Sebastien Goasguen 5a0f600924 New devcloud.cfg to be used with marvin deployDataCenter.py to configure devcloud infra
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-10-08 10:14:42 -04:00
Chip Childers 90fd0793fe Modified devcloud build process to include maven3 install and steps. 2012-10-01 16:56:05 -04:00