incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [20/43] git commit: Summary: Updated devcloud-advanced.cfg and devcloud-kvm-advanced.cfg
Date Tue, 15 Jan 2013 23:55:10 GMT
Summary: Updated devcloud-advanced.cfg and devcloud-kvm-advanced.cfg

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358208922 -0700


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e97090a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e97090a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e97090a9

Branch: refs/heads/api_limit
Commit: e97090a9202452a0ecdff2da55181517cb5b2364
Parents: 896e505
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Mon Jan 14 17:15:22 2013 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Mon Jan 14 17:15:22 2013 -0700

----------------------------------------------------------------------
 tools/devcloud-kvm/devcloud-kvm-advanced.cfg |  136 +++++---------------
 tools/devcloud/devcloud-advanced.cfg         |   10 ++
 2 files changed, 44 insertions(+), 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e97090a9/tools/devcloud-kvm/devcloud-kvm-advanced.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud-kvm/devcloud-kvm-advanced.cfg b/tools/devcloud-kvm/devcloud-kvm-advanced.cfg
index b96805e..1110863 100644
--- a/tools/devcloud-kvm/devcloud-kvm-advanced.cfg
+++ b/tools/devcloud-kvm/devcloud-kvm-advanced.cfg
@@ -2,39 +2,24 @@
     "zones": [
         {
             "localstorageenabled": "true", 
-            "name": "Devcloud-KVM", 
+            "name": "testzone", 
             "guestcidraddress": "10.1.1.0/24", 
             "dns1": "8.8.8.8", 
             "physical_networks": [
                 {
-                    "name": "eth0", 
-                    "providers": [
-                        {
-                            "broadcastdomainrange": "ZONE", 
-                            "name": "VirtualRouter"
-                        }, 
-                        {
-                            "broadcastdomainrange": "ZONE", 
-                            "name": "VpcVirtualRouter"
-                        }
-                    ], 
                     "broadcastdomainrange": "Zone", 
-                    "vlan": "3900-3919", 
+                    "vlan": "3900-4000", 
+                    "name": "eth0",
                     "traffictypes": [
                         {
-                            "kvm": "kvm-guest", 
-                            "typ": "Guest"
+                            "kvm": "cloudbr0", 
+                            "typ": "Management"
                         }, 
                         {
-                            "typ": "Management"
+                            "kvm": "cloudbr0", 
+                            "typ": "Guest"
                         }
                     ], 
-                    "tags": [
-                        "devcloud-guest"
-                    ]
-                }, 
-                {
-                    "name": "eth1", 
                     "providers": [
                         {
                             "broadcastdomainrange": "ZONE", 
@@ -44,63 +29,62 @@
                             "broadcastdomainrange": "ZONE", 
                             "name": "VpcVirtualRouter"
                         }
-                    ], 
+                    ]
+                }, 
+                {
                     "broadcastdomainrange": "Zone", 
-                    "vlan": "3920-3939", 
+                    "name": "eth1", 
                     "traffictypes": [
                         {
-                            "kvm": "kvm-public", 
+                            "kvm": "cloudbr1", 
                             "typ": "Public"
                         }
                     ], 
-                    "tags": [
-                        "devcloud-public"
+                    "providers": [
+                        {
+                            "broadcastdomainrange": "ZONE", 
+                            "name": "VirtualRouter"
+                        }
                     ]
                 }
             ], 
             "ipranges": [
                 {
-                    "startip": "10.0.3.100", 
-                    "endip": "10.0.3.199", 
+                    "startip": "192.168.100.100", 
+                    "endip": "192.168.100.199", 
                     "netmask": "255.255.255.0", 
-                    "vlan": "31", 
-                    "gateway": "10.0.3.2"
+                    "vlan": "untagged", 
+                    "gateway": "192.168.100.1"
                 }
             ], 
             "networktype": "Advanced", 
             "pods": [
                 {
-                    "endip": "192.168.56.249", 
-                    "name": "POD0", 
-                    "startip": "192.168.56.200", 
+                    "endip": "172.17.10.199", 
+                    "name": "testpod", 
+                    "startip": "172.17.10.100", 
                     "netmask": "255.255.255.0", 
                     "clusters": [
                         {
-                            "clustername": "C0", 
+                            "clustername": "testcluster", 
                             "hypervisor": "KVM", 
                             "hosts": [
                                 {
                                     "username": "root", 
-                                    "url": "http://192.168.56.10", 
+                                    "url": "http://172.17.10.10/", 
                                     "password": "password"
                                 }
                             ], 
-                            "clustertype": "CloudManaged", 
-                            "primaryStorages": [
-                                {
-                                    "url": "nfs://192.168.56.10/opt/storage/primary", 
-                                    "name": "PS0"
-                                }
-                            ]
+                            "clustertype": "CloudManaged"
                         }
                     ], 
-                    "gateway": "192.168.56.1"
+                    "gateway": "172.17.10.1"
                 }
             ], 
-            "internaldns1": "8.8.8.8", 
+            "internaldns1": "8.8.4.4", 
             "secondaryStorages": [
                 {
-                    "url": "nfs://192.168.56.10/opt/storage/secondary"
+                    "url": "nfs://172.17.10.10:/nfs/secondary"
                 }
             ]
         }
@@ -115,69 +99,17 @@
     "logger": [
         {
             "name": "TestClient", 
-            "file": "testclient.log"
+            "file": "/var/log/testclient.log"
         }, 
         {
             "name": "TestCase", 
-            "file": "testcase.log"
-        }
-    ], 
-    "globalConfig": [
-        {
-            "name": "storage.cleanup.interval", 
-            "value": "300"
-        }, 
-        {
-            "name": "instance.name", 
-            "value": "vm"
-        }, 
-        {
-            "name": "workers", 
-            "value": "10"
-        }, 
-        {
-            "name": "vm.op.wait.interval", 
-            "value": "5"
-        }, 
-        {
-            "name": "account.cleanup.interval", 
-            "value": "600"
-        }, 
-        {
-            "name": "guest.domain.suffix", 
-            "value": "devcloud.kvm"
-        }, 
-        {
-            "name": "expunge.delay", 
-            "value": "60"
-        }, 
-        {
-            "name": "vm.allocation.algorithm", 
-            "value": "random"
-        }, 
-        {
-            "name": "expunge.interval", 
-            "value": "60"
-        }, 
-        {
-            "name": "expunge.workers", 
-            "value": "3"
-        }, 
-        {
-            "name": "secstorage.allowed.internal.sites", 
-            "value": "10.147.28.0/24"
-        }, 
-        {
-            "name": "check.pod.cidrs", 
-            "value": "true"
+            "file": "/var/log/testcase.log"
         }
     ], 
     "mgtSvr": [
         {
-            "mgtSvrIp": "127.0.0.1", 
-            "passwd": "password", 
-            "user": "root", 
+            "mgtSvrIp": "172.17.10.10", 
             "port": 8096
         }
     ]
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e97090a9/tools/devcloud/devcloud-advanced.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloud-advanced.cfg b/tools/devcloud/devcloud-advanced.cfg
index 54cdd44..ad4cdda 100644
--- a/tools/devcloud/devcloud-advanced.cfg
+++ b/tools/devcloud/devcloud-advanced.cfg
@@ -10,6 +10,16 @@
                     "broadcastdomainrange": "Zone", 
                     "vlan": "3900-4000", 
                     "name": "eth0", 
+                    "traffictypes": [
+                        {
+                            "xen": "Pool-wide network associated with eth0", 
+                            "typ": "Management"
+                        }, 
+                        {
+                            "xen": "Pool-wide network associated with eth0", 
+                            "typ": "Guest"
+                        }
+                    ],
                     "providers": [
                         {
                             "broadcastdomainrange": "ZONE", 


Mime
View raw message