Add SSL configuration

2 files changed, 7 insertions, 1 deletions

diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
index a227c4c10fb..db0fada990f 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java
@@ -153,7 +153,7 @@ public class VespaRecordWriter extends RecordWriter {
         while (tokenizer.hasMoreTokens()) {
             String endpoint = tokenizer.nextToken().trim();
             sessionParams.addCluster(new Cluster.Builder().addEndpoint(
-                    Endpoint.create(endpoint, configuration.defaultPort(), false)
+                    Endpoint.create(endpoint, configuration.defaultPort(), configuration.useSSL())
             ).build());
         }
 
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
index 79b7703032c..17c90061fc8 100644
--- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
+++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java
@@ -12,6 +12,7 @@ public class VespaConfiguration {
 
     public static final String ENDPOINT = "vespa.feed.endpoint";
     public static final String DEFAULT_PORT = "vespa.feed.defaultport";
+    public static final String USE_SSL = "vespa.feed.ssl";
     public static final String PROXY_HOST = "vespa.feed.proxy.host";
     public static final String PROXY_PORT = "vespa.feed.proxy.port";
     public static final String DRYRUN = "vespa.feed.dryrun";
@@ -52,6 +53,11 @@ public class VespaConfiguration {
     }
 
 
+    public boolean useSSL() {
+        return getBoolean(USE_SSL, false);
+    }
+
+
     public String proxyHost() {
         return getString(PROXY_HOST);
     }