From: James Forsyth <jf2512@att.com>
Date: Mon, 9 Apr 2018 19:23:12 +0000 (+0000)
Subject: Merge "Fix issue with Champ startup"
X-Git-Tag: 2.0.0-ONAP~18
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2c41376322b4dc3b2e8afc4d4ef7685439c3650a;hp=-c;p=aai%2Ftest-config.git

Merge "Fix issue with Champ startup"
---

2c41376322b4dc3b2e8afc4d4ef7685439c3650a
diff --combined docker-compose-app.yml
index 289d2d1,6a71ecc..b5d4c61
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@@ -123,14 -123,13 +123,14 @@@ services
      hostname: sparky-be
      volumes:
        - ${UI_LOGS}:/logs
 -      - /opt/test-config/sparky/appconfig:/opt/app/sparky/config
 +      - /opt/test-config/sparky/appconfig:/opt/app/sparky/appconfig
      ports:
        - 9517:9517
      environment:
 -      - CONFIG_HOME=/opt/app/sparky/config
 -      - KEY_STORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
 -      - KEY_MANAGER_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
 +      - KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
 +      - KEYSTORE_ALIAS_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
 +      - SPARKY_SSL_ENABLED=false
 +      - SPARKY_PORTAL_ENABLED=true
      logging:
        driver: "json-file"
        options:
@@@ -155,7 -154,7 +155,7 @@@
        - AJSC_JETTY_BLOCKING_QUEUE_SIZE=200
        - MAX_HEAP=1024
        - SERVICE_BEANS=/opt/app/champ-service/dynamic/conf
-       - GRAPHIMPL=titan-deps
+       - GRAPHIMPL=janus-deps
      logging:
        driver: "json-file"
        options: