1
## Description: Default Ubuntu network settings for Ubuntu/UEC
2
## Origin: Manually generated from diff of Ubuntu 1.6.2 branch and upstream
4
--- a/tools/eucalyptus.conf
5
+++ b/tools/eucalyptus.conf
7
# xenbr1, etc' on older Xen versions, and 'eth0, eth1, etc' on newer
8
# Xen versions. The command 'brctl show' will give you more
9
# information on your local bridge setup.
13
# This indicates where we have a dhcp server binary. We use it to provide
14
# the images with IPs: Eucalyptus provides its own configuration per
16
-VNET_DHCPDAEMON="/usr/sbin/dhcpd"
17
+VNET_DHCPDAEMON="/usr/sbin/dhcpd3"
19
# Some systems have their DHCP daemon configured to run as a non-root
20
# user. If this is the case, set the name of that user here (by
21
# default, Eucalyptus will set up DHCPD configuration files and
22
# directories as owned by root).
23
-#VNET_DHCPUSER="root"
24
+VNET_DHCPUSER="dhcpd"
26
# Following are example eucalyptus VM networking configurations.
27
# There are four modes to choose from (MANAGED, MANAGED-NOVLAN,
29
# to your cloud-contoller's IP address (must be an address that can be
33
+VNET_MODE="MANAGED-NOVLAN"
34
#VNET_SUBNET="192.168.0.0"
35
#VNET_NETMASK="255.255.0.0"
36
#VNET_DNS="your-dns-server-ip"
38
# will typically invoke a DHCP client to aquire an IP address. Use
39
# this mode if you wish to manage VM IPs yourself, or allow the VMs to
40
# pick up an IP from a non-eucalyptus managed DHCP server.
44
# If VNET_MODE is set to STATIC, you can manually configure a set of
45
# IP addresses that will be allocated to VMs at boot time in a first
46
--- a/tools/add_key.pl
47
+++ b/tools/add_key.pl
49
delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
50
$ENV{'PATH'}='/bin:/usr/bin:/sbin:/usr/sbin/';
52
+$eucaconf=$ENV{'EUCALYPTUS'} . "/etc/eucalyptus/eucalyptus.conf";
53
+if (open(FH, "$eucaconf")) {
57
+ if ($line =~ /^\s*VNET_MODE="(.*)"/) {
59
+ if (($mode =~ /MANAGED/) ) {
60
+ # only do key injection if we're not in managed mode
68
#$MOUNT=untaint(`which mount`);
69
#$UMOUNT=untaint(`which umount`);
70
#$MOUNT=untaint("/tmp/euca_mountwrap");