diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-03-05 11:36:16 +1100 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-03-05 15:07:36 +1100 |
| commit | 0a6d897bdaf009f6e441dd8cb282624c3e05a975 (patch) | |
| tree | afa9e2a6cf8b1b397d1000c8372cdf5fd24eadcb /templates | |
| parent | a5f51d7274c8ce32905b05a4ff99f810f768e1c0 (diff) | |
| download | autocluster-0a6d897bdaf009f6e441dd8cb282624c3e05a975.tar.gz autocluster-0a6d897bdaf009f6e441dd8cb282624c3e05a975.tar.xz autocluster-0a6d897bdaf009f6e441dd8cb282624c3e05a975.zip | |
New configuration variable NETWORKS - IPBASE, IPNET* no longer used
Much more flexible network configuration.
Replace canned host_setup/etc/libvirt/qemu/networks/*.xml with
setup_networks.sh script.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/basic-postinstall.sh | 2 | ||||
| -rw-r--r-- | templates/install.xml | 11 | ||||
| -rw-r--r-- | templates/node.xml | 16 |
3 files changed, 3 insertions, 26 deletions
diff --git a/templates/basic-postinstall.sh b/templates/basic-postinstall.sh index a2c8094..8499d70 100644 --- a/templates/basic-postinstall.sh +++ b/templates/basic-postinstall.sh @@ -7,7 +7,7 @@ echo "Using web proxy: \$http_proxy" # force up the network, as kickstart may not have started it -/sbin/ifconfig eth0 @@IPBASE@@.@@IPNET0@@.@@FIRSTIP@@ netmask 255.255.255.0 up +/sbin/ifconfig eth0 @@NETWORK_PRIVATE_PREFIX@@.@@FIRSTIP@@ netmask 255.255.255.0 up /sbin/route add default gw @@GATEWAY@@ /sbin/ifconfig -a /sbin/route -n diff --git a/templates/install.xml b/templates/install.xml index 7c28868..87a4dd7 100644 --- a/templates/install.xml +++ b/templates/install.xml @@ -35,16 +35,7 @@ <target dev='fda'/> <readonly/> </disk> - <interface type='network'> - <mac address='00:00:00:00:00:01'/> - <model type='@@NICMODEL@@'/> - <source network='net1'/> - </interface> - <interface type='network'> - <mac address='00:00:00:00:00:02'/> - <model type='@@NICMODEL@@'/> - <source network='net2'/> - </interface> +@@@NETWORK_TEMPLATE@@@ <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' listen='127.0.0.1'/> <serial type="file"> diff --git a/templates/node.xml b/templates/node.xml index d5bc4bc..7e7779d 100644 --- a/templates/node.xml +++ b/templates/node.xml @@ -24,21 +24,7 @@ <driver name='qemu' type='@@SYSTEM_DISK_FORMAT@@' cache='@@SYSTEM_DISK_CACHE@@'/> </disk> @@@SHAREDDISK_TEMPLATE@@@ - <interface type='network'> - <mac address='@@MAC1@@'/> - <model type='@@NICMODEL@@'/> - <source network='net1'/> - </interface> - <interface type='network'> - <mac address='@@MAC2@@'/> - <model type='@@NICMODEL@@'/> - <source network='net2'/> - </interface> - <interface type='network'> - <mac address='@@MAC3@@'/> - <model type='@@NICMODEL@@'/> - <source network='net3'/> - </interface> +@@@NETWORK_TEMPLATE@@@ <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' listen='127.0.0.1'/> <serial type="file"> |