summaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-03-14 20:17:49 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-14 20:17:49 +0000
commit1b60edb1395afe82c3c34be7958616156af46de4 (patch)
tree125e31a2ee2cb4714991326db373b6abdeb3ccd4 /ms/blueprintsprocessor
parentabdc4a1f59294b8435a4af3738b415fe348967ab (diff)
parent57bef0979c89527072e6f1426da7e8357bb84378 (diff)
Merge "Python lib for RA and component executor"
Diffstat (limited to 'ms/blueprintsprocessor')
-rw-r--r--ms/blueprintsprocessor/application/src/test/resources/application.properties4
-rwxr-xr-xms/blueprintsprocessor/distribution/src/main/docker/Dockerfile2
2 files changed, 3 insertions, 3 deletions
diff --git a/ms/blueprintsprocessor/application/src/test/resources/application.properties b/ms/blueprintsprocessor/application/src/test/resources/application.properties
index 393024516..fc6f72907 100644
--- a/ms/blueprintsprocessor/application/src/test/resources/application.properties
+++ b/ms/blueprintsprocessor/application/src/test/resources/application.properties
@@ -33,8 +33,8 @@ blueprintsprocessor.db.primary.hibernateDDLAuto=update
blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
# Python executor
-blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython
-blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython
+blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints
+blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython/ccsdk_blueprints
security.user.password: {bcrypt}$2a$10$duaUzVUVW0YPQCSIbGEkQOXwafZGwQ/b32/Ys4R1iwSSawFgz7QNu
security.user.name: ccsdkapps
diff --git a/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile b/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile
index d3e10b76d..dab0a4c01 100755
--- a/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile
+++ b/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM anapsix/alpine-java:8_jdk
+FROM omahoco1/alpine-java-python
ENV HTTP_PROXY ${HTTP_PROXY}
ENV HTTPS_PROXY ${HTTPS_PROXY}