summaryrefslogtreecommitdiffstats
path: root/charts/aai-modelloader
diff options
context:
space:
mode:
authorDaniel Silverthorn <daniel.silverthorn@amdocs.com>2018-04-24 20:06:14 +0000
committerDaniel Silverthorn <daniel.silverthorn@amdocs.com>2018-04-25 13:42:50 +0000
commit5b51781093b5bd3dc7d7263fcbd31cdc80dfff7b (patch)
treedf9b95618c4837af70baa8b563489c68271ed838 /charts/aai-modelloader
parent7990d1b55d311e47b891919a65f729ae1fcf83b2 (diff)
Add new model loader config parameters
Change-Id: I347f78d8d911664befcf35dbf1c5edd56b493a66 Issue-ID: AAI-1094 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
Diffstat (limited to 'charts/aai-modelloader')
-rw-r--r--charts/aai-modelloader/resources/config/auth/babel-client-cert.p12bin0 -> 2556 bytes
-rw-r--r--charts/aai-modelloader/resources/config/model-loader.properties15
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
new file mode 100644
index 0000000..dbf4fca
--- /dev/null
+++ b/charts/aai-modelloader/resources/config/auth/babel-client-cert.p12
Binary files differ
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