Commit fc7aadce authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis

deploy: Some minor changes in qa-sample.json

Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
parent 8b77cb97
......@@ -15,11 +15,15 @@
"enabled-hypervisors": "kvm",
"# Dict of hypervisor name and parameters (like on the cmd line)": null,
"hypervisor-parameters": {"kvm": "kernel_path=,vnc_bind_address=0.0.0.0", "xen-pvm": "kernel_path=/boot/vmlinuz-3.2.0-4-amd64", "xen-hvm": "kernel_path=/boot/vmlinuz-3.2.0-4-amd64"},
"hypervisor-parameters": {
"kvm": "kernel_path=,vnc_bind_address=0.0.0.0,migration_caps=xbzrle:auto-converge,vhost_net=True"
},
"# Backend parameters (like on the cmd line)": null,
"backend-parameters": "",
"# Dict of OS name and parameters (like on the cmd line)": null,
"os-parameters": {},
"os-parameters": {
"snf-image+default": "img_passwd=12345678,img_format=diskdump,img_id=debian_base-7.0-x86_64,img_properties=\\{\"OSFAMILY\":\"linux\"\\,\"ROOT_PARTITION\":\"1\"\\}"
},
"# Dict of OS name and value dict of hypervisor parameters": null,
"os-hvp": {},
"primary_ip_version": 4,
......@@ -32,11 +36,16 @@
"enabled-disk-templates": [
"plain",
"drbd",
"diskless"
"diskless",
"ext"
],
"# Additional arguments for initializing cluster": null,
"cluster-init-args": [],
"cluster-init-args": [
"--no-etc-hosts",
"--no-ssh-init",
"--enabled-hypervisors=kvm"
],
"# Network interface for master role": null,
"master-netdev": "%CLUSTER_NETDEV%",
......@@ -44,12 +53,12 @@
"# Default network interface parameters": null,
"default-nicparams": {
"mode": "bridged",
"link": "br0"
"link": "%COMMON_BRIDGE%"
},
"os": "debootstrap+default",
"maxmem": "1024M",
"minmem": "512M",
"os": "snf-image+default",
"maxmem": "512M",
"minmem": "128M",
"# Instance policy specs": null,
"#ispec_cpu_count_max": null,
......
......@@ -1984,7 +1984,8 @@ class GanetiDev(base.Component):
"VG": self.cluster.vg,
"CLUSTER_NETDEV": self.cluster.netdev,
"NODES": simplejson.dumps(sample_nodes),
"DOMAIN": self.cluster.domain
"DOMAIN": self.cluster.domain,
"COMMON_BRIDGE": config.common_bridge
}
r2 = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment