Summary: Updated devcloud-advanced.cfg and devcloud-kvm-advanced.cfg

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358208922 -0700
This commit is contained in:
Marcus Sorensen 2013-01-14 17:15:22 -07:00
parent 896e505da6
commit e97090a920
2 changed files with 48 additions and 106 deletions

View File

@ -2,12 +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",
"broadcastdomainrange": "Zone",
"vlan": "3900-4000",
"name": "eth0",
"traffictypes": [
{
"kvm": "cloudbr0",
"typ": "Management"
},
{
"kvm": "cloudbr0",
"typ": "Guest"
}
],
"providers": [
{
"broadcastdomainrange": "ZONE",
@ -17,90 +29,62 @@
"broadcastdomainrange": "ZONE",
"name": "VpcVirtualRouter"
}
],
"broadcastdomainrange": "Zone",
"vlan": "3900-3919",
"traffictypes": [
{
"kvm": "kvm-guest",
"typ": "Guest"
},
{
"typ": "Management"
}
],
"tags": [
"devcloud-guest"
]
},
{
"broadcastdomainrange": "Zone",
"name": "eth1",
"traffictypes": [
{
"kvm": "cloudbr1",
"typ": "Public"
}
],
"providers": [
{
"broadcastdomainrange": "ZONE",
"name": "VirtualRouter"
},
{
"broadcastdomainrange": "ZONE",
"name": "VpcVirtualRouter"
}
],
"broadcastdomainrange": "Zone",
"vlan": "3920-3939",
"traffictypes": [
{
"kvm": "kvm-public",
"typ": "Public"
}
],
"tags": [
"devcloud-public"
]
}
],
"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
}
]
}
}

View File

@ -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",