diff options
| author |   liboNet <libo.zhu@intel.com> | 2019-04-19 02:10:02 +0800 |
|---|---|---|
| committer | liboNet <libo.zhu@intel.com> | 2019-04-19 02:10:02 +0800 |
| commit | ef9c71ab1efce6e60eb5d8c89cf09c5182c48730 (patch) | |
| tree | 6cddba6d92283b69954765ec0b00963f3aa8feb8 /artifactbroker/packages | |
| parent | e8697face7909927a9ddb418f116c76e3c6d8c8f (diff) | |
enable merge sdc client part into Distribution release image
. update the defaultConfig.json file to include sdc client configuration
. update the DistriubtionActivator to enable parse sdc client and k8s plugin
. rename xacml pdp to k8s
. fix distribution run-time issue
Change-Id: If267f5c256b19ebdbe7b7b2869afcf2f570e4b24
Issue-ID: MULTICLOUD-576
Signed-off-by: liboNet <libo.zhu@intel.com>
Diffstat (limited to 'artifactbroker/packages')
| -rw-r--r-- | artifactbroker/packages/src/main/resources/etc/defaultConfig.json | 60 | ||||
| -rw-r--r-- | artifactbroker/packages/src/main/resources/etc/logback.xml | 4 |
2 files changed, 62 insertions, 2 deletions
diff --git a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json index cb8e1ea..1e9221a 100644 --- a/artifactbroker/packages/src/main/resources/etc/defaultConfig.json +++ b/artifactbroker/packages/src/main/resources/etc/defaultConfig.json @@ -6,5 +6,65 @@ "userName":"healthcheck", "password":"zb!XztG34", "https":true + }, + "receptionHandlerParameters":{ + "SDCReceptionHandler":{ + "receptionHandlerType":"SDC", + "receptionHandlerClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandler", + "receptionHandlerConfigurationName":"sdcConfiguration", + "pluginHandlerParameters":{ + "artifactForwarders":{ + "PAPEngineForwarder":{ + "forwarderType":"PAPEngine", + "forwarderClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarder", + "forwarderConfigurationName": "k8sConfiguration" + } + } + } + } + }, + "receptionHandlerConfigurationParameters":{ + "sdcConfiguration":{ + "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup", + "parameters":{ + "asdcAddress": "sdc-be.onap:8443", + "messageBusAddress": [ + "message-router.onap" + ], + "user": "policy", + "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U", + "pollingInterval":20, + "pollingTimeout":30, + "consumerId": "policy-id", + "artifactTypes": [ + "TOSCA_CSAR", + "HEAT", + "HEAT_ENV", + "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT" + ], + "consumerGroup": "policy-group", + "environmentName": "AUTO", + "keystorePath": "null", + "keystorePassword": "null", + "activeserverTlsAuth": false, + "isFilterinEmptyResources": true, + "isUseHttpsWithDmaap": false + } + } + }, + "artifactForwarderConfigurationParameters":{ + "k8sConfiguration":{ + "parameterClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup", + "parameters":{ + "useHttps": true, + "hostname": "pdp", + "port": 8081, + "userName": "testpdp", + "password": "alpha123", + "clientAuth": "cHl0aG9uOnRlc3Q=", + "isManaged": true, + "pdpGroup": "default" + } + } } } diff --git a/artifactbroker/packages/src/main/resources/etc/logback.xml b/artifactbroker/packages/src/main/resources/etc/logback.xml index ebe06a8..e2d4869 100644 --- a/artifactbroker/packages/src/main/resources/etc/logback.xml +++ b/artifactbroker/packages/src/main/resources/etc/logback.xml @@ -21,10 +21,10 @@ <configuration scan="true" scanPeriod="3 seconds" debug="true"> <!--<jmxConfigurator /> --> <!-- directory path for all other type logs --> - <property name="logDir" value="${POLICY_LOGS}" /> + <property name="logDir" value="${ARTIFACT_LOGS}" /> <!-- directory path for debugging type logs --> - <property name="debugDir" value="${POLICY_LOGS}" /> + <property name="debugDir" value="${ARTIFACT_LOGS}" /> <!-- specify the component name <ONAP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC" --> |