From 2783ded8664505cc0bbfd254fc2a96c5830b66a0 Mon Sep 17 00:00:00 2001
From: Brinda Santh <bs2796@att.com>
Date: Tue, 19 Nov 2019 15:07:32 -0500
Subject: [PATCH] Folder for py-executor TLS certificate files

Issue-ID: CCSDK-1747
Signed-off-by: Brinda Santh <bs2796@att.com>
Change-Id: Ia404322cefbd603fd06bd23ff1d069dc277065ec
---
 ms/py-executor/{ => certs/py-executor}/py-executor-chain.pem | 0
 ms/py-executor/{ => certs/py-executor}/py-executor-key.pem   | 0
 ms/py-executor/configuration.ini                             | 4 ++--
 ms/py-executor/dc/docker-compose.yaml                        | 2 --
 ms/py-executor/docker/distribution.xml                       | 9 ++++++---
 ms/py-executor/docker/start.sh                               | 6 ------
 ms/py-executor/requirements.txt                              | 3 ++-
 7 files changed, 10 insertions(+), 14 deletions(-)
 rename ms/py-executor/{ => certs/py-executor}/py-executor-chain.pem (100%)
 rename ms/py-executor/{ => certs/py-executor}/py-executor-key.pem (100%)

diff --git a/ms/py-executor/py-executor-chain.pem b/ms/py-executor/certs/py-executor/py-executor-chain.pem
similarity index 100%
rename from ms/py-executor/py-executor-chain.pem
rename to 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
similarity index 100%
rename from ms/py-executor/py-executor-key.pem
rename to 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,13 +38,16 @@
             <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>
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
-- 
2.16.6