xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-09-29 00:31:09 +00:00
Code Issues Projects Releases Wiki Activity

Prioritize community if set

Browse Source 
If the community is set, ignore user/password.  This fits expectations
a bit more.
This commit is contained in:
Jarrod Johnson
2017-05-25 15:02:08 -04:00
parent 77bce756cd
commit 9eacb4e3f0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_server/confluent/networking/macmap.py
+6 -6
View File
@@ -337,14 +337,14 @@ def _full_updatemacmap(configmanager):
if not switch:
continue
switchparms = switchcfg.get(switch, {})
snmpc = switchparms.get(
'secret.snmpcommunity', {}).get('value', 'public')
password = switchparms.get(
'secret.hardwaremanagementpassword', {}).get('value', None)
'secret.snmpcommunity', {}).get('value', None)
if not password:
password = snmpc
user = switchparms.get(
'secret.hardwaremanagementuser', {}).get('value', None)
password = switchparms.get(
'secret.hardwaremanagementpassword', {}).get('value',
'public')
user = switchparms.get(
'secret.hardwaremanagementuser', {}).get('value', None)
switchauth.append((switch, password, user))
pool = GreenPool()
for ans in pool.imap(_map_switch, switchauth):