diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-18 15:00:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-18 15:00:18 +0000 |
| commit | f8108884a9f0c06edfe79f02bca853d284075cf0 (patch) | |
| tree | 254ae395306ecf9b1df76becdb4310224d98d525 | |
| parent | 46cf1ba1626145d38cf6ba2dc41690a6936a5ee4 (diff) | |
| parent | b5c6f9382a2fe95ca035a7725ecfdcede7dfb8ee (diff) | |
Merge "[Spike] Update to use DMaaP with SSL"
| -rw-r--r-- | charts/aai-spike/resources/config/auth/tomcat_keystore | bin | 2214 -> 3429 bytes | |||
| -rw-r--r-- | charts/aai-spike/resources/config/spike-beans.xml | 4 | ||||
| -rw-r--r-- | charts/aai-spike/values.yaml | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/charts/aai-spike/resources/config/auth/tomcat_keystore b/charts/aai-spike/resources/config/auth/tomcat_keystore Binary files differindex 9eec841..025f3c4 100644 --- a/charts/aai-spike/resources/config/auth/tomcat_keystore +++ b/charts/aai-spike/resources/config/auth/tomcat_keystore diff --git a/charts/aai-spike/resources/config/spike-beans.xml b/charts/aai-spike/resources/config/spike-beans.xml index 20dfbc5..50be8cb 100644 --- a/charts/aai-spike/resources/config/spike-beans.xml +++ b/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/charts/aai-spike/values.yaml b/charts/aai-spike/values.yaml index c8d2043..6429d3f 100644 --- a/charts/aai-spike/values.yaml +++ b/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: |