aboutsummaryrefslogtreecommitdiffstats
path: root/ms
diff options
context:
space:
mode:
Diffstat (limited to 'ms')
-rwxr-xr-xms/blueprintsprocessor/pom.xml2
-rw-r--r--ms/py-executor/certs/py-executor/py-executor-chain.pem (renamed from ms/py-executor/py-executor-chain.pem)0
-rw-r--r--ms/py-executor/certs/py-executor/py-executor-key.pem (renamed from ms/py-executor/py-executor-key.pem)0
-rw-r--r--ms/py-executor/configuration.ini4
-rwxr-xr-xms/py-executor/dc/docker-compose.yaml2
-rwxr-xr-xms/py-executor/docker/distribution.xml9
-rwxr-xr-xms/py-executor/docker/start.sh6
-rw-r--r--ms/py-executor/requirements.txt3
8 files changed, 11 insertions, 15 deletions
diff --git a/ms/blueprintsprocessor/pom.xml b/ms/blueprintsprocessor/pom.xml
index 658e5c417..cf9d88885 100755
--- a/ms/blueprintsprocessor/pom.xml
+++ b/ms/blueprintsprocessor/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.onap.ccsdk.cds</groupId>
<artifactId>ms</artifactId>
<version>0.7.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>blueprintsprocessor</artifactId>
diff --git a/ms/py-executor/py-executor-chain.pem b/ms/py-executor/certs/py-executor/py-executor-chain.pem
index 30f09dfea..30f09dfea 100644
--- a/ms/py-executor/py-executor-chain.pem
+++ b/ms/py-executor/certs/py-executor/py-executor-chain.pem
diff --git a/ms/py-executor/py-executor-key.pem b/ms/py-executor/certs/py-executor/py-executor-key.pem
index 830a3ae21..830a3ae21 100644
--- a/ms/py-executor/py-executor-key.pem
+++ b/ms/py-executor/certs/py-executor/py-executor-key.pem
diff --git a/ms/py-executor/configuration.ini b/ms/py-executor/configuration.ini
index 5688f39bd..612c62899 100644
--- a/ms/py-executor/configuration.ini
+++ b/ms/py-executor/configuration.ini
@@ -4,8 +4,8 @@ authType=%(AUTH_TYPE)s
# For Token Auth
token=%(AUTH_TOKEN)s
# For TLS Auth
-certChain=%(AUTH_CERT_CHAIN)s
-privateKey=%(AUTH_PRIVATE_KEY)s
+certChain=/opt/app/onap/python/certs/py-executor/py-executor-chain.pem
+privateKey=/opt/app/onap/python/certs/py-executor/py-executor-key.pem
logFile=%(LOG_FILE)s
maxWorkers=20
diff --git a/ms/py-executor/dc/docker-compose.yaml b/ms/py-executor/dc/docker-compose.yaml
index 30298e3c0..63c5eeb4f 100755
--- a/ms/py-executor/dc/docker-compose.yaml
+++ b/ms/py-executor/dc/docker-compose.yaml
@@ -19,8 +19,6 @@ services:
#AUTH_TYPE: basic-auth
#AUTH_TOKEN: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
AUTH_TYPE: tls-auth
- AUTH_CERT_CHAIN: /opt/app/onap/python/py-executor-chain.pem
- AUTH_PRIVATE_KEY: /opt/app/onap/python/py-executor-key.pem
LOG_FILE: /opt/app/onap/logs/application.log
volumes:
diff --git a/ms/py-executor/docker/distribution.xml b/ms/py-executor/docker/distribution.xml
index bb7a8d20a..6d09be8b2 100755
--- a/ms/py-executor/docker/distribution.xml
+++ b/ms/py-executor/docker/distribution.xml
@@ -38,14 +38,17 @@
<includes>
<include>requirements.txt</include>
<include>configuration.ini</include>
- <include>*.crt</include>
- <include>*.key</include>
- <include>*.pem</include>
</includes>
<useDefaultExcludes>true</useDefaultExcludes>
<fileMode>0666</fileMode>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/certs</directory>
+ <outputDirectory>opt/app/onap/python/certs</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <fileMode>0666</fileMode>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/docker</directory>
<outputDirectory>opt/app/onap/python</outputDirectory>
<includes>
diff --git a/ms/py-executor/docker/start.sh b/ms/py-executor/docker/start.sh
index fd53d474b..3a3a9cb70 100755
--- a/ms/py-executor/docker/start.sh
+++ b/ms/py-executor/docker/start.sh
@@ -22,12 +22,6 @@ then
export APP_PORT=50052
fi
-if [ -z "${BASIC_AUTH}" ]
-then
- echo "BASIC_AUTH environment variable is not set, using default."
- export BASIC_AUTH="Basic Y2NzZGthcHBzOmNjc2RrYXBwcw=="
-fi
-
if [ -z "${LOG_FILE}" ]
then
echo "LOG_FILE environment variable is not set, using default."
diff --git a/ms/py-executor/requirements.txt b/ms/py-executor/requirements.txt
index b55636918..6c406bfaf 100644
--- a/ms/py-executor/requirements.txt
+++ b/ms/py-executor/requirements.txt
@@ -2,4 +2,5 @@ grpcio==1.23.0
grpcio-tools==1.23.0
configparser==4.0.2
requests==2.22.0
-ncclient==0.6.6 \ No newline at end of file
+ncclient==0.6.6
+ansible==2.8.5 \ No newline at end of file