diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2016-07-07 14:01:14 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2016-07-07 14:01:14 +0200 |
commit | 5b63a058c63a3055a67d91b12b9ae75eae82f928 (patch) | |
tree | c0a939c4a9ec5b2a7d6af7f3118b34c0706d9cab /config-model/src/main/perl | |
parent | 2cf46bafea51a5e22195ae445ab474da8ebe318a (diff) |
use new code to find configservers
* use binary from vespa_defaults instead of old perl code.
This is mainly to allow VESPA_CONFIGSERVERS environment
configuration to work.
* Also, remove duplicate sourcing of common-env.sh
Diffstat (limited to 'config-model/src/main/perl')
-rwxr-xr-x | config-model/src/main/perl/deploy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-model/src/main/perl/deploy b/config-model/src/main/perl/deploy index 31dda77b99e..47fb64106e0 100755 --- a/config-model/src/main/perl/deploy +++ b/config-model/src/main/perl/deploy @@ -303,7 +303,7 @@ sub fetch_directory { sub get_configsource_url { my ($command) = @_; - my @configsources = split(' ', `$VESPA_HOME/libexec/vespa/vespa-config.pl -confighttpsources`); + my @configsources = split(' ', `$VESPA_HOME/bin/vespa-print-default configservers_http`); my $configsource_url = shift(@configsources); if (!$configsource_url) { die "Could not get url to config server, make sure that VESPA_HOME and services.addr_configserver is set\n"; |