diff options
author | Dan Timoney <dtimoney@att.com> | 2019-03-14 20:17:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-03-14 20:17:49 +0000 |
commit | 52d97b33efad603758bf67a6cfaf38157a696186 (patch) | |
tree | fb1f392961fb492e02d76d4bdb7f1edea9c8cf97 /ms/blueprintsprocessor | |
parent | 63106217c094a413e805b5103d44f6dac9025c42 (diff) | |
parent | 1d06948666688a4854887a27c39ef969e8e2e3be (diff) |
Merge "Python lib for RA and component executor"
Diffstat (limited to 'ms/blueprintsprocessor')
-rw-r--r-- | ms/blueprintsprocessor/application/src/test/resources/application.properties | 4 | ||||
-rwxr-xr-x | ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile | 2 |
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 39302451..fc6f7290 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 d3e10b76..dab0a4c0 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} |