You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/10/08 16:15:25 UTC
git commit: New devcloud.cfg to be used with marvin
deployDataCenter.py to configure devcloud infra Signed-off-by: Chip Childers
Updated Branches:
refs/heads/master 13d771e57 -> 5a0f60092
New devcloud.cfg to be used with marvin deployDataCenter.py to configure devcloud infra
Signed-off-by: Chip Childers <ch...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5a0f6009
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5a0f6009
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5a0f6009
Branch: refs/heads/master
Commit: 5a0f600924f271e2c5b47fb950ac51c9a8904a85
Parents: 13d771e
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Oct 8 10:14:42 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Mon Oct 8 10:14:42 2012 -0400
----------------------------------------------------------------------
tools/devcloud/devcloud.cfg | 51 ++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5a0f6009/tools/devcloud/devcloud.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloud.cfg b/tools/devcloud/devcloud.cfg
index c0ea6c0..10fca37 100644
--- a/tools/devcloud/devcloud.cfg
+++ b/tools/devcloud/devcloud.cfg
@@ -2,14 +2,34 @@
"zones": [
{
"name": "DevCloud0",
- "providers": [
+ "physical_networks": [
{
- "broadcastdomainrange": "ZONE",
- "name": "VirtualRouter"
+ "broadcastdomainrange": "Zone",
+ "name": "test-network",
+ "traffictypes": [
+ {
+ "typ": "Guest"
+ },
+ {
+ "typ": "Management"
+ }
+ ],
+ "providers": [
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "Pod",
+ "name": "SecurityGroupProvider"
+ }
+ ]
}
- ],
+ ],
"dns2": "4.4.4.4",
- "dns1": "8.8.8.8",
+ "dns1": "8.8.8.8",
+ "securitygroupenabled": "true",
+ "localstorageenabled": "true",
"networktype": "Basic",
"pods": [
{
@@ -46,18 +66,11 @@
"internaldns2": "10.0.2.3",
"secondaryStorages": [
{
- "url": "nfs://10.0.2.15/opt/storage/secondary"
+ "url": "nfs://10.0.2.15:/opt/storage/secondary"
}
]
}
],
- "dbSvr": {
- "dbSvr": "localhost",
- "passwd": "cloud",
- "db": "cloud",
- "port": 3306,
- "user": "cloud"
- },
"logger": [
{
"name": "TestClient",
@@ -80,6 +93,18 @@
{
"name": "expunge.interval",
"value": "60"
+ },
+ {
+ "name":"enable.ec2.api",
+ "value":"true"
+ },
+ {
+ "name":"system.vm.use.local.storage",
+ "value":"true"
+ },
+ {
+ "name":"enable.s3.api",
+ "value":"true"
}
],
"mgtSvr": [