diff options
| author |   Venkata Harish Kajur <vk250x@att.com> | 2018-05-07 21:49:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-07 21:49:14 +0000 |
| commit | 08a1c6f74aa96b572fde52309e4be2d7d06439a8 (patch) | |
| tree | cbe2abdf08dcdd11c022ff09ffd2c9bf257b0cbf | |
| parent | 3284d1fa5c236f93415e9f665ce93a7641d019e4 (diff) | |
| parent | 816f9de50813a19efb00ab0d9853816f04859484 (diff) | |
Merge "Fix babel config to allow HEAT startup"
| -rw-r--r-- | babel/appconfig/babel-auth.properties | 2 | ||||
| -rwxr-xr-x | deploy_vm1.sh | 2 | ||||
| -rw-r--r-- | docker-compose-app.yml | 2 | ||||
| -rw-r--r-- | model-loader/appconfig/model-loader.properties | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/babel/appconfig/babel-auth.properties b/babel/appconfig/babel-auth.properties index 5fd2646..e7dfda0 100644 --- a/babel/appconfig/babel-auth.properties +++ b/babel/appconfig/babel-auth.properties @@ -1,2 +1,2 @@ auth.policy.file=/auth/auth_policy.json -auth.authentication.disable=false
\ No newline at end of file +auth.authentication.disable=true diff --git a/deploy_vm1.sh b/deploy_vm1.sh index db2abd4..fdf6623 100755 --- a/deploy_vm1.sh +++ b/deploy_vm1.sh @@ -15,7 +15,7 @@ export MODEL_LOADER_LOGS="/opt/aai/logroot/AAI-MODEL-LOADER"; export UI_LOGS="/opt/aai/logroot/AAI-UI"; export CHAMP_LOGS="/opt/aai/logroot/AAI-CHAMP-SERVICE"; export CRUD_LOGS="/opt/aai/logroot/AAI-CRUD-SERVICE"; -export BABEL_LOGS="/opt/aai/logroot/AAI-BABEL"; +export BABEL_LOGS="/opt/aai/logroot/AAI-BAS"; if [ ! -d "$RESOURCES_LOGS" ]; then diff --git a/docker-compose-app.yml b/docker-compose-app.yml index 2203ac1..41fc90c 100644 --- a/docker-compose-app.yml +++ b/docker-compose-app.yml @@ -191,7 +191,7 @@ services: image: ${DOCKER_REGISTRY}/onap/babel hostname: babel volumes: - - ${BABEL_LOGS}:/logs + - ${BABEL_LOGS}:/opt/app/babel/logs/AAI-BAS - /opt/test-config/babel/appconfig:/opt/app/babel/config ports: - 9516:9516 diff --git a/model-loader/appconfig/model-loader.properties b/model-loader/appconfig/model-loader.properties index 510cbe1..3019189 100644 --- a/model-loader/appconfig/model-loader.properties +++ b/model-loader/appconfig/model-loader.properties @@ -19,7 +19,7 @@ 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:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+ml.aai.KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
ml.aai.AUTH_USER=ModelLoader
ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
|