aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/charts
diff options
context:
space:
mode:
authorMichael Arrastia <MArrasti@amdocs.com>2018-09-18 10:57:03 +0100
committerMichael Arrastia <MArrasti@amdocs.com>2018-09-18 10:57:03 +0100
commit86cc273b9fd0ce30ecbd04ecb3da2c9db4cca61d (patch)
tree9c3b7c23296a60e2c7aea4b5a8559a0ce59fc243 /kubernetes/aai/charts
parentbc7c2b8308105985d2807a1ddd94537b5b6bbbd3 (diff)
[Spike] Update to use DMaaP with SSL
- DMaaP client configured to use HTTPS protocol in XML bean definition. - Values yaml updated with port and protocol. - Update JKS trust store (tomcat_keystore) to accept the DMaaP certificate. Change-Id: I71e8592b5aa6ca2170ee8449a14e6c7469a93839 Issue-ID: AAI-1537 Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>
Diffstat (limited to 'kubernetes/aai/charts')
-rw-r--r--kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystorebin2214 -> 3429 bytes
-rw-r--r--kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml4
-rw-r--r--kubernetes/aai/charts/aai-spike/values.yaml3
3 files changed, 6 insertions, 1 deletions
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore b/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore
index 9eec841aa2..025f3c49da 100644
--- a/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore
+++ b/kubernetes/aai/charts/aai-spike/resources/config/auth/tomcat_keystore
Binary files differ
diff --git a/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml b/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
index 20dfbc5e6d..50be8cb0f8 100644
--- a/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
+++ b/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
@@ -37,6 +37,8 @@
<constructor-arg name="timeoutMs" value="1000" />
<constructor-arg name="messageLimit" value="100" />
<constructor-arg name="transportType" value="HTTPAUTH" />
+ <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
+ <constructor-arg name="filter"><null /></constructor-arg>
</bean>
<bean id="eventPublisher" class="org.onap.aai.event.client.DMaaPEventPublisher" >
@@ -48,6 +50,8 @@
<constructor-arg name="maxAgeMs" value="250" />
<constructor-arg name="delayBetweenBatchesMs" value="50" />
<constructor-arg name="transportType" value="HTTPAUTH" />
+ <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
+ <constructor-arg name="contentType" value="application/json" />
</bean>
<bean id="spikeService" class="org.onap.aai.spike.service.SpikeService" init-method="startup">
diff --git a/kubernetes/aai/charts/aai-spike/values.yaml b/kubernetes/aai/charts/aai-spike/values.yaml
index c8d20437ad..6429d3f119 100644
--- a/kubernetes/aai/charts/aai-spike/values.yaml
+++ b/kubernetes/aai/charts/aai-spike/values.yaml
@@ -65,7 +65,8 @@ resources: {}
# XML bean configuration
event:
port:
- dmaap: 3904
+ dmaap: 3905
+ protocol: https
consumer:
topic: champRawEvents
publisher: