aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2018-09-18 15:00:18 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-18 15:00:18 +0000
commitfaf8f9297c89e88e85e324159d1fa03170c93f27 (patch)
tree41dfee6af224ece93d378dd7cf83ca395382d129 /kubernetes
parent7982a74097d2d1b5c301cf2a73ef91a21ef45d45 (diff)
parent86cc273b9fd0ce30ecbd04ecb3da2c9db4cca61d (diff)
Merge "[Spike] Update to use DMaaP with SSL"
Diffstat (limited to 'kubernetes')
-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: