summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanilo Sousa <danilopopeye@users.noreply.github.com>2017-08-22 12:13:21 -0300
committerGitHub <noreply@github.com>2017-08-22 12:13:21 -0300
commita4174019e55992182a357573022a8ce024284bf7 (patch)
tree004ae4c83df115a3d1d13817bec9fee235d5c025
parentc8ca088c1314bc55284fd6bc110a2372d22b1ce4 (diff)
parentbff3ae4f6113f255c1a79ce8c1d5dd47f4f8ea21 (diff)
Merge pull request #782 from crami/master
no space after password
-rw-r--r--README.md2
-rw-r--r--lib/oxidized/model/ironware.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 23404d5..3fb06e3 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 3ab8da1..386d585 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