You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/01/16 00:55:10 UTC
[23/43] git commit: Summary: Edit devcloud cfg files for advanced
networking, add comments
Summary: Edit devcloud cfg files for advanced networking, add comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0412cb8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0412cb8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0412cb8d
Branch: refs/heads/api_limit
Commit: 0412cb8d9225b9c9fcc2ed4cfb94e702a0ea9c70
Parents: 7374056
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Tue Jan 15 02:16:25 2013 +0000
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Tue Jan 15 02:16:25 2013 +0000
----------------------------------------------------------------------
tools/devcloud/devcloud-advanced.cfg | 5 +-
tools/devcloud/devcloud-advanced_internal-mgt.cfg | 124 ++++++++++++++++
2 files changed, 128 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0412cb8d/tools/devcloud/devcloud-advanced.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloud-advanced.cfg b/tools/devcloud/devcloud-advanced.cfg
index ad4cdda..cfbc815 100644
--- a/tools/devcloud/devcloud-advanced.cfg
+++ b/tools/devcloud/devcloud-advanced.cfg
@@ -1,3 +1,6 @@
+# This configuration is meant for running advanced networking, with management server on the laptop.
+# It requires that the user run a DNS resolver within devcloud via 'apt-get install dnsmasq'
+
{
"zones": [
{
@@ -81,7 +84,7 @@
"gateway": "192.168.56.1"
}
],
- "internaldns1": "8.8.4.4",
+ "internaldns1": "192.168.56.10",
"secondaryStorages": [
{
"url": "nfs://192.168.56.10:/opt/storage/secondary"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0412cb8d/tools/devcloud/devcloud-advanced_internal-mgt.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloud-advanced_internal-mgt.cfg b/tools/devcloud/devcloud-advanced_internal-mgt.cfg
new file mode 100644
index 0000000..e360b6b
--- /dev/null
+++ b/tools/devcloud/devcloud-advanced_internal-mgt.cfg
@@ -0,0 +1,124 @@
+# This config is designed to run as an advanced network, with management server in devcloud
+# It also requires an 'apt-get install dnsmasq' to run a resolver in devcloud for internal dns
+
+{
+ "zones": [
+ {
+ "localstorageenabled": "true",
+ "name": "testzone",
+ "guestcidraddress": "10.1.1.0/24",
+ "dns1": "8.8.8.8",
+ "physical_networks": [
+ {
+ "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",
+ "name": "VirtualRouter"
+ },
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VpcVirtualRouter"
+ }
+ ]
+ },
+ {
+ "broadcastdomainrange": "Zone",
+ "name": "eth1",
+ "traffictypes": [
+ {
+ "xen": "Pool-wide network associated with eth1",
+ "typ": "Public"
+ }
+ ],
+ "providers": [
+ {
+ "broadcastdomainrange": "ZONE",
+ "name": "VirtualRouter"
+ }
+ ]
+ }
+ ],
+ "ipranges": [
+ {
+ "startip": "10.0.3.100",
+ "endip": "10.0.3.199",
+ "netmask": "255.255.255.0",
+ "vlan": "untagged",
+ "gateway": "10.0.3.2"
+ }
+ ],
+ "networktype": "Advanced",
+ "pods": [
+ {
+ "endip": "192.168.56.249",
+ "name": "testpod",
+ "startip": "192.168.56.200",
+ "netmask": "255.255.255.0",
+ "clusters": [
+ {
+ "clustername": "testcluster",
+ "hypervisor": "XenServer",
+ "hosts": [
+ {
+ "username": "root",
+ "url": "http://192.168.56.10/",
+ "password": "password"
+ }
+ ],
+ "clustertype": "CloudManaged"
+ }
+ ],
+ "gateway": "192.168.56.1"
+ }
+ ],
+ "internaldns1": "192.168.56.10",
+ "secondaryStorages": [
+ {
+ "url": "nfs://192.168.56.10:/opt/storage/secondary"
+ }
+ ]
+ }
+ ],
+ "dbSvr": {
+ "dbSvr": "127.0.0.1",
+ "passwd": "cloud",
+ "db": "cloud",
+ "port": 3306,
+ "user": "cloud"
+ },
+ "logger": [
+ {
+ "name": "TestClient",
+ "file": "/var/log/testclient.log"
+ },
+ {
+ "name": "TestCase",
+ "file": "/var/log/testcase.log"
+ }
+ ],
+ "mgtSvr": [
+ {
+ "mgtSvrIp": "192.168.56.10",
+ "port": 8096
+ }
+ ],
+ "globalConfig": [
+ {
+ "name": "host",
+ "value": "192.168.56.10"
+ }
+ ]
+}