Permalink
Browse files

Drop ATA over Ethernet support

Fixes EUCA-2166
  • Loading branch information...
1 parent de9c8db commit dde34adbded032da3e7238f3b3480a9a6a12e31a @gholms gholms committed May 17, 2012
Showing with 1 addition and 14 deletions.
  1. +0 −3 clc/eucadmin/eucadmin/configfile.py
  2. +1 −6 tools/eucalyptus-cloud.in
  3. +0 −5 tools/eucalyptus.conf.5
View
3 clc/eucadmin/eucadmin/configfile.py
@@ -100,10 +100,7 @@ def mergefile(self, oldconfig):
old_version = open(old_version_file).readlines()[0].strip()
if old_version.startswith('2') or old_version.startswith('eee-2'):
- self.comment('DISABLE_ISCSI')
self._read_config_data(oldconfig)
- if not self.has_key('DISABLE_ISCSI'):
- self['DISABLE_ISCSI'] = 'Y'
deprecatedopts = [ '--walrus-host', '--cloud-host',
'--remote-storage', '--remote-walrus',
View
7 tools/eucalyptus-cloud.in
@@ -215,12 +215,7 @@ do_start() {
cd $EUCALYPTUS/etc/eucalyptus
- # options from the configuration file
- if [ "$DISABLE_ISCSI" = "Y" ]; then
- CLOUD_OPTS="$CLOUD_OPTS --disable-iscsi"
- fi
-
- #Check if we need to upgrade
+ # Check if we need to upgrade
if [ -e $EUCALYPTUS/etc/eucalyptus/.upgrade ]; then
do_upgrade
fi
View
5 tools/eucalyptus.conf.5
@@ -50,11 +50,6 @@ Options affecting CLC, WC, SC only:
Enable/disable Eucalyptus dynamic DNS functionality.
.RE
-.BI DISABLE_ISCSI="Y"
-.RS
-Use either iSCSI or AoE for dynamic block storage.
-.RE
-
.BI JVM_MEM="512m"
.RS
Amount of memory to allocate to the JVM. This number value will affect how many instances you can over a period of time. These processes are memory hungry; give them as much memory as you can spare. At least 2048m is recommended for very busy Eucalyptus deployments.

0 comments on commit dde34ad

Please sign in to comment.