diff options
| author | ytti <saku@ytti.fi> | 2016-08-23 02:53:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 02:53:23 +0300 |
| commit | 8ac599c29c5422dc63b7a1392fb4f5ee6c3ac3a4 (patch) | |
| tree | 2f2af82d4866799281d851580c4d53d881550b30 | |
| parent | dade4b939ce4a3326edfa51665f6ec8a92d27716 (diff) | |
| parent | 63f9fc3ba7c190e0cbd3af183a233d18dde4cd08 (diff) | |
Merge pull request #537 from nertwork/master
This PR is to fix the cumulus
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | lib/oxidized/model/cumulus.rb | 14 | ||||
| -rw-r--r-- | lib/oxidized/version.rb | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e7b220..b80da22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 0.16.3 +- BUGFIX: cumulus prompt not working with default switch configs (by @nertwork) + # 0.16.1 - BUGFIX: unnecessary puts statement removed from git.rb diff --git a/lib/oxidized/model/cumulus.rb b/lib/oxidized/model/cumulus.rb index 68d856e..dc6792a 100644 --- a/lib/oxidized/model/cumulus.rb +++ b/lib/oxidized/model/cumulus.rb @@ -1,6 +1,6 @@ class Cumulus < Oxidized::Model - prompt /^((\w*)@(.*)([>#]\s)+)$/ + prompt /^((\w*)@(.*)):/ comment '# ' @@ -22,7 +22,7 @@ class Cumulus < Oxidized::Model cfg += cmd 'cat /etc/hosts' cfg += add_comment 'THE INTERFACES' - cfg += cmd 'cat /etc/network/interfaces' + cfg += cmd 'grep -r "" /etc/network/interface* | cut -d "/" -f 4-' cfg += add_comment 'RESOLV.CONF' cfg += cmd 'cat /etc/resolv.conf' @@ -30,6 +30,9 @@ class Cumulus < Oxidized::Model cfg += add_comment 'NTP.CONF' cfg += cmd 'cat /etc/ntp.conf' + cfg += add_comment 'IP Routes' + cfg += cmd 'netstat -rn' + cfg += add_comment 'QUAGGA DAEMONS' cfg += cmd 'cat /etc/quagga/daemons' @@ -55,10 +58,13 @@ class Cumulus < Oxidized::Model cfg += cmd 'cat /etc/cumulus/switchd.conf' cfg += add_comment 'ACL' - cfg += cmd 'iptables -L' + cfg += cmd 'iptables -L -n' cfg += add_comment 'VERSION' cfg += cmd 'cat /etc/cumulus/etc.replace/os-release' + + cfg += add_comment 'License' + cfg += cmd 'cl-license' end @@ -73,4 +79,4 @@ class Cumulus < Oxidized::Model end -end
\ No newline at end of file +end diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb index 40996a8..023f184 100644 --- a/lib/oxidized/version.rb +++ b/lib/oxidized/version.rb @@ -1,3 +1,3 @@ module Oxidized - VERSION = '0.16.1' + VERSION = '0.16.2' end |