summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-12-12 10:51:01 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-12-12 10:51:01 -1000
commita20069a8f08cefc8fac6e84db08a1c60454b9497 (patch)
treec90428cd35c2d8cdd8f1d0d8e33e95328945b03a
parent0f1da6b45bc4d5ce87ac155672bc3ebe2e9b9ba8 (diff)
downloadanaconda-a20069a8f08cefc8fac6e84db08a1c60454b9497.tar.gz
anaconda-a20069a8f08cefc8fac6e84db08a1c60454b9497.tar.xz
anaconda-a20069a8f08cefc8fac6e84db08a1c60454b9497.zip
Fix non-CHAP iBFT install cases (#432819)
Patch from Hans de Goede <hdegoede@redhat.com>
-rw-r--r--iscsi.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/iscsi.py b/iscsi.py
index 37366cb45..89220c02a 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -388,10 +388,20 @@ class iscsi(object):
self.updateIscsidConf(record)
+ if record.has_key('node.session.auth.username'):
+ username = record['node.session.auth.username']
+ else:
+ username = None
+
+ if record.has_key('node.session.auth.password'):
+ password = record['node.session.auth.password']
+ else:
+ password = None
+
t = iscsiTarget(ipaddr=record['node.conn[%s].address' % (n,)],
port=record['node.conn[%s].port' % (n,)],
- user=record['node.session.auth.username'],
- pw=record['node.session.auth.password'],
+ user=username,
+ pw=password,
discover = False)
self.targets.append(t)