46 Commits

Author SHA1 Message Date
Vijayendra Bhamidipati
2dbdc46337 CLOUDSTACK-1734: Make SHA1 default password encoding mechanism
Description:

	Making SHA256SALT the default encoding algorithm to encode
	passwords when creating/updating users.

	Introducing a new configurable list to allow admins to
	separately configure the order of preference for encoding
	and authentication schemes.

	Since passwords are now sent by clients as clear text,
	fixing the Plain text authenticator to check against the
	password passed in rather than its md5 digest.
2013-04-02 17:40:50 -07:00
Prasanna Santhanam
792db8b5cc simulator: removing cyclic dependency from simulator
The database creator caused a cyclic dependecny in the simulator which
is removed with this commit. Additionally the simulator profile is now
merged with developer profile and a test for server health is included

Steps to run:
$ mvn -Pdeveloper clean install
$ mvn -Pdeveloper -pl developer -Ddeploydb
$ mvn -Pdeveloper -pl developer -Ddeploydb-simulator
$ mvn -pl client jetty:run

To deploy an adv. zone and test the server health:
$ mvn -Pdeveloper,marvin -Dmarvin.config=`find . -name simulator.cfg` -pl :cloud-marvin test

Conflicts:
	pom.xml

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-20 10:36:43 +05:30
Rohit Yadav
a32c6d5c9d db: Fix deploydb, make sure scripts are in path
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-25 11:00:56 +05:30
Rohit Yadav
357b4e63ac Revert "make the create database work"
This reverts commit 1c77ae62374f2d1a064726bb7bcf1814a0c0b1ff.
2013-02-25 11:00:56 +05:30
Alex Huang
1c77ae6237 make the create database work 2013-02-23 19:07:22 -08: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
Rohit Yadav
16e81130cc db: Fix developer's deploydb and cloud-setup-databases for rolling update
- Fix developer prefill to use 4.0's schema
- Fix developer/pom.xml and cloud-setup-databases to not run create-schema-view,
  the upgrade path is configured to do a rolling update and set it up

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 17:18:42 +05:30
Rohit Yadav
f2ae6dcda9 db: Remove and merge 4.1-new-db-schema.sql to schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-16 12:44:45 +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
Rohit Yadav
44287d20c0 CLOUDSTACK-1181: Find by catalina.home property first
The previous commit fails if a person had defined CATALINA_HOME already.
Instead of system env variable, get any passed variable 'catalina.home' and find
the file in that path.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 12:14:46 +05:30
Rohit Yadav
23f7267753 CLOUDSTACK-1181: Fix Environment so db.properties is in classpath
We export CATALINA_HOME to utils/ which is the path which a lot of utils class would
check and read db.properties file. This is exactly what is done in production.
The utils classes (Transaction, Encryption*Checker etc.) would use PropertiesUtil
which tries to find it in CATALINA_HOME.

The only issue is, even if someone defined an override file, the encryption type
would be still read from the db.properties file. For all other params, the override
file would be re read and datastores would be reinitialized

BUG-ID: CLOUDSTACK-1181

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-11 12:00:16 +05:30
Kelven Yang
296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00
Kishan Kavala
fc925022bd Upgrade changes for Region schema. Made region_id not null 2013-02-01 13:49:57 +05:30
Rohit Yadav
e70143c1dc maven: Fix developer/pom.xml to use DatabaseCreator
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-18 18:11:42 -08:00
Rohit Yadav
b45cdef5d9 DatabaseCreator: Process db props, sql and upgrade classes separately
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 18:25:27 -08:00
Rohit Yadav
cafe881acb maven: Fix deploydb in developer/pom.xml to pass through DatabaseCreator
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-17 16:10:07 -08:00
Rohit Yadav
1db3a84a03 maven: Fix deploydb in developer/pom.xml
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-16 17:25:55 -08:00
Kelven Yang
727fab71cb Disable StorageProvider, storageType introduced in Javelin new code, temporarily, to make existing code run 2013-01-16 14:16:01 -08:00
Kelven Yang
a2dab60236 deprecate storage provider in StroragePoolVO 2013-01-15 18:07:19 -08:00
Alex Huang
b6c56736e5 merge from master 2013-01-09 05:20:36 -08:00
Alex Huang
14bd345f1f merge compiles 2013-01-09 04:41:27 -08:00
Min Chen
d22229eb9d Remove updateUuids code in ConfigurationServerImpl (which is not the
right approach to populate uuid column since it will impact upgrade as
well), and populate UUID column in seed data sql script.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-08 17:12:14 -08:00
Alex Huang
30f2565d98 Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
Rohit Yadav
22e3454ae4 developer: Load create-schema-view sql for developer deploydb profile
The fix would run create-schema-view.sql which would setup db table views.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-04 13:08:29 -08:00
Prasanna Santhanam
1f1a13448f simulator: resurrect simulator hypervisor as plugin
Multiple fixes:
1. changes to the mvn configuration
    a. include simulator to client.war
    b. activate simulator by profile
2. templates for simulator
3. developer prefill for simulator
    a. Use deplydb-simulator to setup simulator db
4. Inherit components-simulator.xml from components.xml
5. ListVolumesCommand missed for MockStorageManager
6. Include simulator properties into utils/db.properties

TODO:
 Secondary storage VMs don't come up because ComponentLocator doesn't
retain a unique set of adapaters by name. Fix this in subsequent
checkin.
2012-12-23 19:28:57 -08:00
Edison Su
550f4fbcdc create template/primary data store is done 2012-11-20 18:57:19 -08:00
Dave Cahill
476e771c1c SSH key changes 2012-11-05 11:24:33 -08:00
Rohit Yadav
f940c566ab developer: Add developer-prefill.sql to be executed by developer profile
Removes all other custom sqlCommand configs, have the developer profile setup
from developer-prefill.sql file.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-04 01:58:50 +05:30
Rohit Yadav
2bbbdbf58b developer: Move custom sql commands to one prefill schema file
The sql-maven plugin does not allow multiple sqlCommands to executed, only the
last one in the <configuration> gets executed, so moving out all the developer
related schema to one file.

Adds:
  - ROOT domain
  - system and admin accounts
  - system and admin users
  - custom configurations

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-04 01:57:05 +05:30
Alex Huang
50f175e3f9 Finally got rid of create-index-fk.sql. Merged everything into create-schema.sql 2012-11-01 13:40:16 -07:00
Alex Huang
772f660c33 Changed the create database steps to be create from a single create-schema.sql and then apply database modifications 2012-11-01 13:40:15 -07:00
Prasanna Santhanam
5e2c1ef26e Summary: Open up the integration api port on the developer profile
Detail: Included the sqlCommand query to insert the
integration.api.port=8096 during managment server boot.

This will only affect developer runs where debugging is enabled.

BUG-ID : CLOUDSTACK-421
Reviewed-by: Prasanna Santhanam <tsp@apache.org>
Reported-by: Prasanna Santhanam <tsp@apache.org>

Testing:
$ mvn clean install
$ mvn -P developer -pl developer -Ddeploydb
$ mvn -pl :cloud-client-ui jetty:run

mysql> select * from configuration where name like 'integr%';
+----------+----------+-------------------+----------------------+-------+-------------+
| category | instance | component         | name                 | value | description |
+----------+----------+-------------------+----------------------+-------+-------------+
| Advanced | DEFAULT  | management-server | integration.api.port | 8096 | NULL        |
+----------+----------+-------------------+----------------------+-------+-------------+
1 row in set (0.01 sec)

http://localhost:8096/client/api?command=listOsTypes&keyword=CentOS%205.5&response=json

Returns:
{
   "listostypesresponse":{
      "count":2,
      "ostype":[
         {
            "id":"2474781c-52b6-42a1-aee4-b2ee159bbb41",
            "oscategoryid":"2188dd50-5d27-4c41-8f90-97bbadfc2206",
            "description":"CentOS 5.5 (32-bit)"
         },
         {
            "id":"fd95b25a-a46c-439e-af5c-1d2f1c149edd",
            "oscategoryid":"2188dd50-5d27-4c41-8f90-97bbadfc2206",
            "description":"CentOS 5.5 (64-bit)"
         }
      ]
   }
}

Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1351405027 +0530
2012-10-28 11:47:07 +05:30
Edison Su
bf21081633 follow the http://mojo.codehaus.org/exec-maven-plugin/examples/example-exec-using-plugin-dependencies.html 2012-10-25 22:38:24 -07:00
Alex Huang
a388a748d0 Added a database creator class. not working yet. Edison will look at it 2012-10-25 17:34:54 -07:00
Edison Su
b104d22b77 if db.properties.override missing, shouldn't panic 2012-10-19 15:27:44 -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
Edison Su
06d516a80c if db.properties.override missing, shouldn't panic 2012-10-10 16:20:35 -07:00
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
Hugo Trippaers
09739cfd78 Add the sql files for the cloudbridge 2012-10-02 07:35:59 -07:00
Hugo Trippaers
9ebe83286e create the usage db as well 2012-10-01 21:36:38 -07:00
Hugo Trippaers
aa6355ffe6 Updated master to 4.1.0
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer  -DdevelopmentVersion=4.1.0-SNAPSHOT
2012-10-01 11:00:55 -07:00
Hugo Trippaers
fe4cd5ecd0 Fix ordering of the statements as bare statements are allowed only once 2012-09-24 14:43:47 -07:00
Hugo Trippaers
24efe5c6cd Add the init configuration item, otherwise it will not be updated 2012-09-22 22:00:21 +02:00
Hugo Trippaers
8cde670871 Fix ordering of sql commands and set root domain 2012-09-22 13:44:33 +02:00
Hugo Trippaers
4c38152afe Add cloud database creation to maven, use mvn -P developer -pl developer
-Ddeploydb
2012-09-22 11:28:33 +02:00