You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/07/30 12:07:19 UTC
[11/16] git commit: Sandbox scripts for generating one host
configuration
Sandbox scripts for generating one host configuration
- marvin/sandbox/advanced
- marvin/sandbox/basic
* supports generating configurations for cloudstack deployment with
properties files. The format of the config, properties files and the
process is explained in the tutorial:
http://wiki.cloudstack.org/display/QA/Testing+with+python#Testingwithpython-DeploymentConfiguration
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ba33a25c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ba33a25c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ba33a25c
Branch: refs/heads/master
Commit: ba33a25c575897654fd8200b40596709be24a907
Parents: 7026822
Author: Prasanna Santhanam <Pr...@citrix.com>
Authored: Fri Jun 29 13:24:57 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 30 15:27:55 2012 +0530
----------------------------------------------------------------------
tools/marvin/marvin/sandbox/basic/setup.properties | 43 +++++++++++++++
tools/marvin/setup.py | 1 -
2 files changed, 43 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba33a25c/tools/marvin/marvin/sandbox/basic/setup.properties
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/basic/setup.properties b/tools/marvin/marvin/sandbox/basic/setup.properties
new file mode 100644
index 0000000..08cdb79
--- /dev/null
+++ b/tools/marvin/marvin/sandbox/basic/setup.properties
@@ -0,0 +1,43 @@
+[globals]
+#global settings in cloudstack
+expunge.delay=60
+expunge.interval=60
+storage.cleanup.interval=300
+account.cleanup.interval=600
+expunge.workers=3
+workers=10
+use.user.concentrated.pod.allocation=false
+vm.allocation.algorithm=random
+vm.op.wait.interval=5
+guest.domain.suffix=sandbox.kvm
+instance.name=QA
+direct.agent.load.size=1000
+default.page.size=10000
+check.pod.cidrs=true
+secstorage.allowed.internal.sites=10.147.28.0/24
+[environment]
+dns=10.147.28.6
+mshost=localhost
+mysql.host=localhost
+mysql.cloud.user=cloud
+mysql.cloud.passwd=cloud
+[cloudstack]
+#guest VLAN
+zone.vlan=675-679
+#management network
+private.gateway=10.147.29.1
+private.pod.startip=10.147.29.150
+private.pod.endip=10.147.29.159
+private.netmask=255.255.255.0
+#public network
+public.gateway=10.147.31.1
+public.vlan.startip=10.147.31.150
+public.vlan.endip=10.147.31.159
+public.netmask=255.255.255.0
+#hypervisor host information
+hypervisor=Simulator
+host=sim
+host.password=password
+#storage pools
+primary.pool=nfs://10.147.28.6:/export/home/sandbox/kamakura
+secondary.pool=nfs://10.147.28.6:/export/home/sandbox/sstor
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ba33a25c/tools/marvin/setup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index b2d6a40..211011d 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -36,7 +36,6 @@ setup(name="Marvin",
packages=["marvin", "marvin.cloudstackAPI", "marvin.sandbox", "marvin.sandbox.advanced", "marvin.sandbox.basic", "marvin.pymysql", "marvin.pymysql.constants", "marvin.pymysql.tests"],
license="LICENSE.txt",
install_requires=[
- "Python>=2.7",
"paramiko",
"nose"
],