Merge pull request #2634 from yahoo/hmusum/remove-support-for-removed-api

Remove support for /application/v1 API (removed in Vespa 6)

1 files changed, 3 insertions, 9 deletions

diff --git a/config-model/src/main/perl/deploy b/config-model/src/main/perl/deploy
index 8ddc948c3f2..dc7b2132792 100755
--- a/config-model/src/main/perl/deploy
+++ b/config-model/src/main/perl/deploy
@@ -72,7 +72,7 @@ readConfFile();
 use strict;
 use warnings;
 use feature qw(switch say);
-use vars qw/ $opt_c $opt_h $opt_n $opt_v $opt_f $opt_t $opt_1 $opt_a $opt_e $opt_E $opt_r $opt_i $opt_p $opt_H $opt_R /;
+use vars qw/ $opt_c $opt_h $opt_n $opt_v $opt_f $opt_t $opt_a $opt_e $opt_E $opt_r $opt_i $opt_p $opt_H $opt_R /;
 use Env qw($HOME);
 use JSON;
 use Getopt::Std;
@@ -102,7 +102,7 @@ my $version = "v2";
 my $configserver = "";
 my $port = "19071";
 
-getopts('c:fhnt:v1e:E:r:a:i:p:HR:');
+getopts('c:fhnt:ve:E:r:a:i:p:HR:');
 
 if ($opt_h) {
   usage();
@@ -137,13 +137,7 @@ if ($opt_p) {
   $port = $opt_p;
 }
 
-# Use v1 of application API
-if ($opt_1) {
-  $version = "v1";
-  $pathPrefix = "/application/v1/session";
-} else {
-  $pathPrefix = "/application/v2/tenant/$tenant/session";
-}
+$pathPrefix = "/application/v2/tenant/$tenant/session";
 
 create_cloudconfig_dir();