From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Tue, 5 Mar 2019 16:40:10 +0000 (+0100)
Subject: Fix SSH transport for Ansible server
X-Git-Tag: 0.4.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=78327d7d3e648a393ce247216e99fb4d966bd79e

Fix SSH transport for Ansible server

with previous configuration of ansible server docker, as there was no
ssh binary, ansible switched to paramiko and it was causing "cannot
import name aead".

Added "ssh" as binary and tried to make paramiko work as some modules
requires it (such as PAN-OS). but it still fails with the same error...

Also given "ansible-server" to ansible user as it can create
PlaybooksTemp (wasn't allowed before).

Change-Id: Ic4a82e29edcf68b44219cd17dabcf2f6b03dc6c8
Issue-ID: APPC-1523
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
---

diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile
index 7ad66d30..40de69e6 100644
--- a/ansible-server/src/main/Dockerfile
+++ b/ansible-server/src/main/Dockerfile
@@ -10,6 +10,7 @@ COPY ansible-server/requirements.txt ansible-server/requirements.txt
 RUN apk add --no-cache curl \
                        bash \
                        py2-pip \
+                       openssh-client \
                        python2 &&\
     apk add --no-cache --virtual .build-deps build-base \
                                              libffi-dev \
@@ -29,6 +30,7 @@ WORKDIR /opt/ansible-server
 RUN mkdir /opt/onap ; ln -s /opt/ansible-server /opt/onap/ccsdk
 RUN echo > /var/log/ansible-server.log
 RUN chown ansible:ansible /var/log/ansible-server.log
+RUN chown ansible:ansible /opt/ansible-server
 
 USER ansible:ansible
 
diff --git a/ansible-server/src/main/ansible-server/requirements.txt b/ansible-server/src/main/ansible-server/requirements.txt
index 3d508f4e..858db8c8 100644
--- a/ansible-server/src/main/ansible-server/requirements.txt
+++ b/ansible-server/src/main/ansible-server/requirements.txt
@@ -1,4 +1,6 @@
 PyMySQL
 cherrypy<18.0.0
 requests
-ansible
\ No newline at end of file
+ansible
+paramiko
+aead