summaryrefslogtreecommitdiffstats
path: root/ansible-server/src/main
diff options
context:
space:
mode:
authorTaka Cho <takamune.cho@att.com>2019-02-18 14:31:27 -0500
committerTaka Cho <takamune.cho@att.com>2019-02-18 14:33:53 -0500
commit9bec848ff9fc2c421f25bd0f998f67685f8b53aa (patch)
tree77c122b7a66db0eb95c74982673bf7baba54f335 /ansible-server/src/main
parentf4089a2309fecb01e6e3ef06e03991a6be02e2d9 (diff)
make ansible container backward compatible
Due to failure on docker-compose in APPC heat and k8s in APPC pod. I made this change backward compatible Change-Id: I9f4bb7b4a6d75cfdc7e3272b3382474342fb142c Issue-ID: APPC-1441 Signed-off-by: Taka Cho <takamune.cho@att.com>
Diffstat (limited to 'ansible-server/src/main')
-rw-r--r--ansible-server/src/main/Dockerfile6
-rw-r--r--ansible-server/src/main/ansible-server/startAnsibleServer.sh6
2 files changed, 10 insertions, 2 deletions
diff --git a/ansible-server/src/main/Dockerfile b/ansible-server/src/main/Dockerfile
index e0abb04a..4a9c4147 100644
--- a/ansible-server/src/main/Dockerfile
+++ b/ansible-server/src/main/Dockerfile
@@ -7,7 +7,9 @@ WORKDIR /opt/
COPY ansible-server/requirements.txt ansible-server/requirements.txt
-RUN apk add --no-cache py2-pip \
+RUN apk add --no-cache curl \
+ bash \
+ py2-pip \
python2 &&\
apk add --no-cache --virtual .build-deps build-base \
libffi-dev \
@@ -26,4 +28,4 @@ RUN mkdir /opt/onap ; ln -s /opt/ansible-server /opt/onap/ccsdk
EXPOSE 8000
-ENTRYPOINT ["python2", "RestServer.py"]
+##ENTRYPOINT ["python2", "RestServer.py"]
diff --git a/ansible-server/src/main/ansible-server/startAnsibleServer.sh b/ansible-server/src/main/ansible-server/startAnsibleServer.sh
new file mode 100644
index 00000000..193fe77f
--- /dev/null
+++ b/ansible-server/src/main/ansible-server/startAnsibleServer.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+exec &> >(tee -a "/var/log/ansible-server.log")
+
+cd /opt/onap/ccsdk
+exec /usr/bin/python RestServer.py
+