mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
cafd820e3e
Added few enhancements to marvin. Added new module for Logging Facility to marvin. Added new Init facility to marvin. Currently, there are multiple ways we are doing logging Removed few unwanted logging cases. Removed few command line switch options for logging. The new way of logging now provides consolidated logging under one single folder timestamped under the configured folder path. Removed parsing configuration from deploydata center Added parsing,start logging and deploy as part of init Added new error handling facility to catch unknown exception from test cases. Currently, lot of scripts are throwing unknown exceptions, add a handler to plugin to dump them to a file ToDO: Will do clean up in phase2 for this patch. Separate deployDatacenter from creating test client. Clean up configGenerator
223 lines
7.1 KiB
INI
223 lines
7.1 KiB
INI
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
{
|
|
"zones": [
|
|
{
|
|
"name": "Sandbox-simulator",
|
|
"guestcidraddress": "10.1.1.0/24",
|
|
"dns1": "10.147.28.6",
|
|
"physical_networks": [
|
|
{
|
|
"broadcastdomainrange": "Zone",
|
|
"vlan": "100-200",
|
|
"name": "Sandbox-pnet",
|
|
"traffictypes": [
|
|
{
|
|
"typ": "Guest"
|
|
},
|
|
{
|
|
"typ": "Management"
|
|
},
|
|
{
|
|
"typ": "Public"
|
|
}
|
|
],
|
|
"providers": [
|
|
{
|
|
"broadcastdomainrange": "ZONE",
|
|
"name": "VirtualRouter"
|
|
},
|
|
{
|
|
"broadcastdomainrange": "ZONE",
|
|
"name": "VpcVirtualRouter"
|
|
},
|
|
{
|
|
"broadcastdomainrange": "ZONE",
|
|
"name": "InternalLbVm"
|
|
}
|
|
],
|
|
"isolationmethods": [
|
|
"VLAN"
|
|
]
|
|
}
|
|
],
|
|
"ipranges": [
|
|
{
|
|
"startip": "192.168.2.2",
|
|
"endip": "192.168.2.200",
|
|
"netmask": "255.255.255.0",
|
|
"vlan": "50",
|
|
"gateway": "192.168.2.1"
|
|
}
|
|
],
|
|
"networktype": "Advanced",
|
|
"pods": [
|
|
{
|
|
"endip": "172.16.15.200",
|
|
"name": "POD0",
|
|
"startip": "172.16.15.2",
|
|
"netmask": "255.255.255.0",
|
|
"clusters": [
|
|
{
|
|
"clustername": "C0",
|
|
"hypervisor": "simulator",
|
|
"hosts": [
|
|
{
|
|
"username": "root",
|
|
"url": "http://sim/c0/h0",
|
|
"password": "password"
|
|
},
|
|
{
|
|
"username": "root",
|
|
"url": "http://sim/c0/h1",
|
|
"password": "password"
|
|
}
|
|
],
|
|
"clustertype": "CloudManaged",
|
|
"primaryStorages": [
|
|
{
|
|
"url": "nfs://10.147.28.6:/export/home/sandbox/primary0",
|
|
"name": "PS0"
|
|
},
|
|
{
|
|
"url": "nfs://10.147.28.6:/export/home/sandbox/primary1",
|
|
"name": "PS1"
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"clustername": "C1",
|
|
"hypervisor": "simulator",
|
|
"hosts": [
|
|
{
|
|
"username": "root",
|
|
"url": "http://sim/c1/h0",
|
|
"password": "password"
|
|
}
|
|
],
|
|
"clustertype": "CloudManaged",
|
|
"primaryStorages": [
|
|
{
|
|
"url": "nfs://10.147.28.6:/export/home/sandbox/primary2",
|
|
"name": "PS2"
|
|
}
|
|
]
|
|
}
|
|
],
|
|
"gateway": "172.16.15.1"
|
|
}
|
|
],
|
|
"internaldns1": "10.147.28.6",
|
|
"secondaryStorages": [
|
|
{
|
|
"url": "nfs://10.147.28.6:/export/home/sandbox/secondary",
|
|
"provider" : "NFS"
|
|
}
|
|
]
|
|
}
|
|
],
|
|
"dbSvr": {
|
|
"dbSvr": "localhost",
|
|
"passwd": "cloud",
|
|
"db": "cloud",
|
|
"port": 3306,
|
|
"user": "cloud"
|
|
},
|
|
"logger":
|
|
{
|
|
"LogFolderPath": "/tmp/"
|
|
},
|
|
"globalConfig": [
|
|
{
|
|
"name": "network.gc.wait",
|
|
"value": "60"
|
|
},
|
|
{
|
|
"name": "storage.cleanup.interval",
|
|
"value": "300"
|
|
},
|
|
{
|
|
"name": "vm.op.wait.interval",
|
|
"value": "5"
|
|
},
|
|
{
|
|
"name": "default.page.size",
|
|
"value": "10000"
|
|
},
|
|
{
|
|
"name": "network.gc.interval",
|
|
"value": "60"
|
|
},
|
|
{
|
|
"name": "instance.name",
|
|
"value": "QA"
|
|
},
|
|
{
|
|
"name": "workers",
|
|
"value": "10"
|
|
},
|
|
{
|
|
"name": "account.cleanup.interval",
|
|
"value": "600"
|
|
},
|
|
{
|
|
"name": "guest.domain.suffix",
|
|
"value": "sandbox.simulator"
|
|
},
|
|
{
|
|
"name": "expunge.delay",
|
|
"value": "60"
|
|
},
|
|
{
|
|
"name": "vm.allocation.algorithm",
|
|
"value": "random"
|
|
},
|
|
{
|
|
"name": "expunge.interval",
|
|
"value": "60"
|
|
},
|
|
{
|
|
"name": "expunge.workers",
|
|
"value": "3"
|
|
},
|
|
{
|
|
"name": "check.pod.cidrs",
|
|
"value": "true"
|
|
},
|
|
{
|
|
"name": "secstorage.allowed.internal.sites",
|
|
"value": "10.147.28.0/24"
|
|
},
|
|
{
|
|
"name": "direct.agent.load.size",
|
|
"value": "1000"
|
|
}
|
|
],
|
|
"mgtSvr": [
|
|
{
|
|
"mgtSvrIp": "localhost",
|
|
"passwd": "password",
|
|
"user": "root",
|
|
"port": 8096,
|
|
"hypervisor": "simulator",
|
|
"useHttps": "False",
|
|
"certCAPath": "NA",
|
|
"certPath": "NA"
|
|
}
|
|
]
|
|
}
|