Merge branch 'master' into og-add-store-phase

This commit is contained in:
Oliver Gorwits
2019-03-14 22:04:07 +00:00
5 changed files with 21 additions and 17 deletions

View File

@@ -3,10 +3,10 @@
[NEW FEATURES] [NEW FEATURES]
* netdisco-sshcollector no longer required - the functionality (arpnip via * netdisco-sshcollector no longer required - the functionality (arpnip via
ssh) will be run within netdisco's core schedule ssh) will be run within netdisco's core schedule (rc9000 and ollyg)
* get_credentials replaces get_community and accepts any device_auth stanza * get_credentials replaces get_community and accepts any device_auth stanza
in JSON format in JSON format (ollyg)
2.040007 - 2019-03-06 2.040007 - 2019-03-06

View File

@@ -57,9 +57,9 @@ L<Docker images|https://store.docker.com/community/images/netdisco/netdisco> are
=back =back
We have several other pages with tips for We have several other pages with tips for
L<alternate deployment scenarios|https://github.com/netdisco/netdisco/wiki/Install-Tips>, L<installation tips|https://github.com/netdisco/netdisco/wiki/Install-Tips>,
L<understanding and troubleshooting Netdisco|https://github.com/netdisco/netdisco/wiki/Troubleshooting>, L<understanding and troubleshooting Netdisco|https://github.com/netdisco/netdisco/wiki/Troubleshooting>,
L<tips and tricks for specific platforms|https://github.com/netdisco/netdisco/wiki/Vendor-Tips>, L<notes for specific device vendors|https://github.com/netdisco/netdisco/wiki/Vendor-Tips>,
and L<all the configuration options|https://github.com/netdisco/netdisco/wiki/Configuration>. and L<all the configuration options|https://github.com/netdisco/netdisco/wiki/Configuration>.
You can also speak to someone in the C<#netdisco@freenode> IRC channel, or on You can also speak to someone in the C<#netdisco@freenode> IRC channel, or on
@@ -70,16 +70,19 @@ L<Release Notes|https://github.com/netdisco/netdisco/wiki/Release-Notes>.
=head1 Dependencies =head1 Dependencies
Netdisco has several Perl library dependencies which will be automatically Netdisco has several Perl library dependencies which will be automatically
installed. However it's I<strongly> recommended that you first install installed. However it's required that you first install the following
L<DBD::Pg>, L<SNMP>, and a compiler using your operating system packages. operating system packages:
On Ubuntu/Debian: On Ubuntu/Debian:
root:~# apt-get install libdbd-pg-perl libsnmp-perl libssl-dev libio-socket-ssl-perl build-essential root:~# apt-get install libdbd-pg-perl libsnmp-perl libssl-dev libio-socket-ssl-perl curl postgresql build-essential
On Fedora/Red-Hat: On Fedora/Red-Hat:
root:~# yum install perl-core perl-DBD-Pg net-snmp-perl net-snmp-devel openssl-devel make automake gcc root:~# yum install perl-core perl-DBD-Pg net-snmp-perl net-snmp-devel openssl-devel curl postgresql-server postgresql-contrib make automake gcc
root:~# postgresql-setup initdb
root:~# systemctl start postgresql
root:~# systemctl enable postgresql
On BSD systems please see L<our BSD tips|https://github.com/netdisco/netdisco/wiki/BSD-Install>. On BSD systems please see L<our BSD tips|https://github.com/netdisco/netdisco/wiki/BSD-Install>.
@@ -104,9 +107,11 @@ application:
postgres:~$ createdb -O netdisco netdisco postgres:~$ createdb -O netdisco netdisco
The default PostgreSQL configuration isn't well tuned for modern server You may wish to L<amend the PostgreSQL
hardware. We strongly recommend that you use the C<pgtune> Python program to configuration|https://github.com/netdisco/netdisco/wiki/Install-Tips#enable-md5-authentication-to-postgresql>
auto-tune your C<postgresql.conf> file: so that local connections are working. The default PostgreSQL configuration
also needs tuning for modern server hardware. We recommend that you use the
C<pgtune> Python program to auto-tune your C<postgresql.conf> file:
=over 4 =over 4

View File

@@ -1,4 +1,4 @@
package App::Netdisco::Transport::CLI; package App::Netdisco::Transport::SSH;
use Dancer qw/:syntax :script/; use Dancer qw/:syntax :script/;
@@ -11,14 +11,14 @@ use base 'Dancer::Object::Singleton';
=head1 NAME =head1 NAME
App::Netdisco::Transport::CLI App::Netdisco::Transport::SSH
=head1 DESCRIPTION =head1 DESCRIPTION
Returns an object which has an active SSH connection which can be used Returns an object which has an active SSH connection which can be used
for some actions such as arpnip. for some actions such as arpnip.
my $cli = App::Netdisco::Transport::CLI->session_for( ... ); my $cli = App::Netdisco::Transport::SSH->session_for( ... );
=cut =cut

View File

@@ -6,7 +6,7 @@ use Dancer::Plugin::DBIC 'schema';
use App::Netdisco::Worker::Plugin; use App::Netdisco::Worker::Plugin;
use aliased 'App::Netdisco::Worker::Status'; use aliased 'App::Netdisco::Worker::Status';
use App::Netdisco::Transport::CLI (); use App::Netdisco::Transport::SSH ();
use App::Netdisco::Transport::SNMP (); use App::Netdisco::Transport::SNMP ();
use App::Netdisco::Util::Node qw/check_mac store_arp/; use App::Netdisco::Util::Node qw/check_mac store_arp/;
@@ -83,7 +83,7 @@ register_worker({ phase => 'main', driver => 'cli' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my $device = $job->device; my $device = $job->device;
my $cli = App::Netdisco::Transport::CLI->session_for($device) my $cli = App::Netdisco::Transport::SSH->session_for($device)
or return Status->defer("arpnip failed: could not SSH connect to $device"); or return Status->defer("arpnip failed: could not SSH connect to $device");
# should be both v4 and v6 # should be both v4 and v6

View File

@@ -415,7 +415,6 @@ worker_plugins:
- 'Vlan::Core' - 'Vlan::Core'
extra_worker_plugins: [] extra_worker_plugins: []
# - Discover::ConfigBackup::CLI
driver_priority: driver_priority:
restconf: 500 restconf: 500