diff --git a/README.md b/README.md index 23404d539..3fb06e317 100644 --- a/README.md +++ b/README.md @@ -520,7 +520,7 @@ source: adapter: mysql2 database: oxidized table: nodes - username: root + user: root password: rootpass map: name: ip diff --git a/lib/oxidized/model/ironware.rb b/lib/oxidized/model/ironware.rb index 3ab8da1ce..386d58545 100644 --- a/lib/oxidized/model/ironware.rb +++ b/lib/oxidized/model/ironware.rb @@ -70,7 +70,7 @@ class IronWare < Oxidized::Model # match expected prompts on both older and newer # versions of IronWare username /^(Please Enter Login Name|Username):/ - password /^(Please Enter Password |Password):/ + password /^(Please Enter Password ?|Password):/ end #handle pager with enable