Skip to content

Commit e97090a

Browse files
author
Marcus Sorensen
committed
Summary: Updated devcloud-advanced.cfg and devcloud-kvm-advanced.cfg
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358208922 -0700
1 parent 896e505 commit e97090a

2 files changed

Lines changed: 44 additions & 102 deletions

File tree

‎tools/devcloud-kvm/devcloud-kvm-advanced.cfg‎

Lines changed: 34 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,24 @@
22
"zones": [
33
{
44
"localstorageenabled": "true",
5-
"name": "Devcloud-KVM",
5+
"name": "testzone",
66
"guestcidraddress": "10.1.1.0/24",
77
"dns1": "8.8.8.8",
88
"physical_networks": [
99
{
10-
"name": "eth0",
11-
"providers": [
12-
{
13-
"broadcastdomainrange": "ZONE",
14-
"name": "VirtualRouter"
15-
},
16-
{
17-
"broadcastdomainrange": "ZONE",
18-
"name": "VpcVirtualRouter"
19-
}
20-
],
2110
"broadcastdomainrange": "Zone",
22-
"vlan": "3900-3919",
11+
"vlan": "3900-4000",
12+
"name": "eth0",
2313
"traffictypes": [
2414
{
25-
"kvm": "kvm-guest",
26-
"typ": "Guest"
15+
"kvm": "cloudbr0",
16+
"typ": "Management"
2717
},
2818
{
29-
"typ": "Management"
19+
"kvm": "cloudbr0",
20+
"typ": "Guest"
3021
}
3122
],
32-
"tags": [
33-
"devcloud-guest"
34-
]
35-
},
36-
{
37-
"name": "eth1",
3823
"providers": [
3924
{
4025
"broadcastdomainrange": "ZONE",
@@ -44,63 +29,62 @@
4429
"broadcastdomainrange": "ZONE",
4530
"name": "VpcVirtualRouter"
4631
}
47-
],
32+
]
33+
},
34+
{
4835
"broadcastdomainrange": "Zone",
49-
"vlan": "3920-3939",
36+
"name": "eth1",
5037
"traffictypes": [
5138
{
52-
"kvm": "kvm-public",
39+
"kvm": "cloudbr1",
5340
"typ": "Public"
5441
}
5542
],
56-
"tags": [
57-
"devcloud-public"
43+
"providers": [
44+
{
45+
"broadcastdomainrange": "ZONE",
46+
"name": "VirtualRouter"
47+
}
5848
]
5949
}
6050
],
6151
"ipranges": [
6252
{
63-
"startip": "10.0.3.100",
64-
"endip": "10.0.3.199",
53+
"startip": "192.168.100.100",
54+
"endip": "192.168.100.199",
6555
"netmask": "255.255.255.0",
66-
"vlan": "31",
67-
"gateway": "10.0.3.2"
56+
"vlan": "untagged",
57+
"gateway": "192.168.100.1"
6858
}
6959
],
7060
"networktype": "Advanced",
7161
"pods": [
7262
{
73-
"endip": "192.168.56.249",
74-
"name": "POD0",
75-
"startip": "192.168.56.200",
63+
"endip": "172.17.10.199",
64+
"name": "testpod",
65+
"startip": "172.17.10.100",
7666
"netmask": "255.255.255.0",
7767
"clusters": [
7868
{
79-
"clustername": "C0",
69+
"clustername": "testcluster",
8070
"hypervisor": "KVM",
8171
"hosts": [
8272
{
8373
"username": "root",
84-
"url": "http://192.168.56.10",
74+
"url": "http://172.17.10.10/",
8575
"password": "password"
8676
}
8777
],
88-
"clustertype": "CloudManaged",
89-
"primaryStorages": [
90-
{
91-
"url": "nfs://192.168.56.10/opt/storage/primary",
92-
"name": "PS0"
93-
}
94-
]
78+
"clustertype": "CloudManaged"
9579
}
9680
],
97-
"gateway": "192.168.56.1"
81+
"gateway": "172.17.10.1"
9882
}
9983
],
100-
"internaldns1": "8.8.8.8",
84+
"internaldns1": "8.8.4.4",
10185
"secondaryStorages": [
10286
{
103-
"url": "nfs://192.168.56.10/opt/storage/secondary"
87+
"url": "nfs://172.17.10.10:/nfs/secondary"
10488
}
10589
]
10690
}
@@ -115,69 +99,17 @@
11599
"logger": [
116100
{
117101
"name": "TestClient",
118-
"file": "testclient.log"
102+
"file": "/var/log/testclient.log"
119103
},
120104
{
121105
"name": "TestCase",
122-
"file": "testcase.log"
123-
}
124-
],
125-
"globalConfig": [
126-
{
127-
"name": "storage.cleanup.interval",
128-
"value": "300"
129-
},
130-
{
131-
"name": "instance.name",
132-
"value": "vm"
133-
},
134-
{
135-
"name": "workers",
136-
"value": "10"
137-
},
138-
{
139-
"name": "vm.op.wait.interval",
140-
"value": "5"
141-
},
142-
{
143-
"name": "account.cleanup.interval",
144-
"value": "600"
145-
},
146-
{
147-
"name": "guest.domain.suffix",
148-
"value": "devcloud.kvm"
149-
},
150-
{
151-
"name": "expunge.delay",
152-
"value": "60"
153-
},
154-
{
155-
"name": "vm.allocation.algorithm",
156-
"value": "random"
157-
},
158-
{
159-
"name": "expunge.interval",
160-
"value": "60"
161-
},
162-
{
163-
"name": "expunge.workers",
164-
"value": "3"
165-
},
166-
{
167-
"name": "secstorage.allowed.internal.sites",
168-
"value": "10.147.28.0/24"
169-
},
170-
{
171-
"name": "check.pod.cidrs",
172-
"value": "true"
106+
"file": "/var/log/testcase.log"
173107
}
174108
],
175109
"mgtSvr": [
176110
{
177-
"mgtSvrIp": "127.0.0.1",
178-
"passwd": "password",
179-
"user": "root",
111+
"mgtSvrIp": "172.17.10.10",
180112
"port": 8096
181113
}
182114
]
183-
}
115+
}

‎tools/devcloud/devcloud-advanced.cfg‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010
"broadcastdomainrange": "Zone",
1111
"vlan": "3900-4000",
1212
"name": "eth0",
13+
"traffictypes": [
14+
{
15+
"xen": "Pool-wide network associated with eth0",
16+
"typ": "Management"
17+
},
18+
{
19+
"xen": "Pool-wide network associated with eth0",
20+
"typ": "Guest"
21+
}
22+
],
1323
"providers": [
1424
{
1525
"broadcastdomainrange": "ZONE",

0 commit comments

Comments
 (0)