[pkg-eucalyptus-commits] r280 - eucalyptus/trunk/debian/patches

[Brian Thomason]

Author: iamfuzz-guest
Date: 2012-10-05 17:52:38 +0000 (Fri, 05 Oct 2012)
New Revision: 280

Added:
   eucalyptus/trunk/debian/patches/set-default-values.patch
Modified:
   eucalyptus/trunk/debian/patches/series
Log:
Returned to setting some default values in eucalyptus.conf which somehow got lost in the mix


Modified: eucalyptus/trunk/debian/patches/series
===================================================================
--- eucalyptus/trunk/debian/patches/series	2012-10-05 17:35:07 UTC (rev 279)
+++ eucalyptus/trunk/debian/patches/series	2012-10-05 17:52:38 UTC (rev 280)
@@ -1,4 +1,5 @@
 disable-config-validation.patch
+set-default-values.patch
 enable-wsdl.patch
 modify-init-files.patch
 create-var-run-euca.patch

Added: eucalyptus/trunk/debian/patches/set-default-values.patch
===================================================================
--- eucalyptus/trunk/debian/patches/set-default-values.patch	                        (rev 0)
+++ eucalyptus/trunk/debian/patches/set-default-values.patch	2012-10-05 17:52:38 UTC (rev 280)
@@ -0,0 +1,41 @@
+Description: Set some defaults in config file
+Author: Brian Thomason <brian.thomason at eucalyptus.com>
+
+--- eucalyptus-3.1.0.orig/tools/eucalyptus.conf
++++ eucalyptus-3.1.0/tools/eucalyptus.conf
+@@ -3,7 +3,7 @@
+ ###########################################################################
+ 
+ # Where Eucalyptus is installed
+-EUCALYPTUS="not_configured"
++EUCALYPTUS="/"
+ 
+ # This is the username that you would like eucalyptus to run as
+ EUCA_USER="eucalyptus"
+@@ -81,7 +81,7 @@ NC_SERVICE="axis2/services/EucalyptusNC"
+ 
+ # The hypervisor that the NC will interact with in order to manage
+ # virtual machines.  Supported values include "kvm" and "xen".
+-HYPERVISOR="not_configured"
++HYPERVISOR="kvm"
+ 
+ # The following three options determine whether KVM uses Virtio for
+ # specific types of I/O with instances.  These options only affect the
+@@ -133,7 +133,7 @@ USE_VIRTIO_NET="0"
+ 
+ # The directory where the NC will store instances' root filesystems,
+ # ephemeral storage, and cached copies of images.
+-INSTANCE_PATH="not_configured"
++INSTANCE_PATH="/var/lib/eucalyptus/instances"
+ 
+ # If euca-bundle-upload, euca-check-bucket, or euca-delete-bundle do
+ # not appear in the NC's search PATH then specify their locations here.
+@@ -177,7 +177,7 @@ VNET_PUBINTERFACE="eth0"
+ # network interfaces should attach.  A physical interface that can reach
+ # the CC must be attached to this bridge.
+ # Networking modes: System, Static, Managed (No VLAN)
+-VNET_BRIDGE="xenbr0"
++VNET_BRIDGE="br0"
+ 
+ # A map of MAC addresses to IP addresses that Eucalyptus should allocate
+ # to instances when running in Static mode.  Separate MAC addresses and