summaryrefslogtreecommitdiffstats
path: root/kubernetes/pomba/charts/pomba-networkdiscovery/resources
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-12-12 18:44:12 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-12 18:44:12 +0000
commita0cacb279412715823f553314306bc4b2ff25a82 (patch)
treed94499ed8905a40d1e1f4266f545d742732a3cb7 /kubernetes/pomba/charts/pomba-networkdiscovery/resources
parent671c3510bc1e2cab0b8886fe64c87c7c31d67d44 (diff)
parentc40d75739834fe2bd237d543cc9f8549931620af (diff)
Merge "Update OOM to for HTTPS for Network Discovery"
Diffstat (limited to 'kubernetes/pomba/charts/pomba-networkdiscovery/resources')
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties8
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystorebin0 -> 2214 bytes
2 files changed, 8 insertions, 0 deletions
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
index a59cf41b33..cccba6b7bc 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
@@ -31,6 +31,14 @@ server.tomcat.max-idle-time=60000
#Servlet context parameters
server.context_parameters.p-name=value #context parameter with p-name as key and value as value.
+#Enable HTTPS
+server.port={{ .Values.config.serverSslPort }}
+server.ssl.key-store={{ .Values.config.serverSslKeyStore }}
+server.ssl.key-store-password={{ .Values.config.serverSslKeyStorePassword }}
+server.ssl.client-auth={{ .Values.config.serverSslClientAuth }}
+server.ssl.enabled={{ .Values.config.serverSslEnabled }}
+server.ssl.enabled-protocols={{ .Values.config.serverSslEnabledProtocols }}
+
# Basic Authentication
basicAuth.username={{ .Values.config.networkDiscoveryUserId }}
basicAuth.password={{ .Values.config.networkDiscoveryPassword }}
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore
new file mode 100644
index 0000000000..9eec841aa2
--- /dev/null
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/auth/tomcat_keystore
Binary files differ