diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-04-25 14:56:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-25 14:56:59 +0000 |
| commit | 04494e41245adb6afc8ce4918cac3fc20ccea422 (patch) | |
| tree | b33dc8408863439eafbac601c23ff079f3e30cad | |
| parent | e75006872b418b9daba3c30000f991ba16ae1328 (diff) | |
| parent | 5b51781093b5bd3dc7d7263fcbd31cdc80dfff7b (diff) | |
Merge "Add new model loader config parameters"
| -rw-r--r-- | charts/aai-modelloader/resources/config/auth/babel-client-cert.p12 | bin | 0 -> 2556 bytes | |||
| -rw-r--r-- | charts/aai-modelloader/resources/config/model-loader.properties | 15 |
2 files changed, 11 insertions, 4 deletions
diff --git a/charts/aai-modelloader/resources/config/auth/babel-client-cert.p12 b/charts/aai-modelloader/resources/config/auth/babel-client-cert.p12 Binary files differnew file mode 100644 index 0000000..dbf4fca --- /dev/null +++ b/charts/aai-modelloader/resources/config/auth/babel-client-cert.p12 diff --git a/charts/aai-modelloader/resources/config/model-loader.properties b/charts/aai-modelloader/resources/config/model-loader.properties index 5604c1f..e9b24b6 100644 --- a/charts/aai-modelloader/resources/config/model-loader.properties +++ b/charts/aai-modelloader/resources/config/model-loader.properties @@ -10,14 +10,21 @@ ml.distribution.PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go ml.distribution.POLLING_INTERVAL=30 ml.distribution.POLLING_TIMEOUT=20 ml.distribution.USER=aai -ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG +ml.distribution.ARTIFACT_TYPES=MODEL_QUERY_SPEC,TOSCA_CSAR +ml.distribution.MSG_BUS_ADDRESSES=message-router.{{.Release.Namespace}} # Model Loader AAI REST Client Configuration ml.aai.BASE_URL=https://aai.{{.Release.Namespace}}:8443 -ml.aai.MODEL_URL=/aai/v10/service-design-and-creation/models/model/ -ml.aai.NAMED_QUERY_URL=/aai/v10/service-design-and-creation/named-queries/named-query/ -ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images +ml.aai.MODEL_URL=/aai/v*/service-design-and-creation/models/model/ +ml.aai.NAMED_QUERY_URL=/aai/v*/service-design-and-creation/named-queries/named-query/ +ml.aai.VNF_IMAGE_URL=/aai/v*/service-design-and-creation/vnf-images ml.aai.KEYSTORE_FILE=aai-os-cert.p12 ml.aai.KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o ml.aai.AUTH_USER=ModelLoader ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw + +# Model Loader Babel REST Client Configuration\r +ml.babel.BASE_URL=https://aai-babel.{{.Release.Namespace}}:9516 +ml.babel.GENERATE_ARTIFACTS_URL=/services/babel-service/v1/app/generateArtifacts +ml.babel.KEYSTORE_FILE=babel-client-cert.p12 +ml.babel.KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 |