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 7ad66d3..40de69e 100644 (file)
--- 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 3d508f4..858db8c 100644 (file)
--- 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