From 1c7e45507c7686a236cf5f23bb572142d8be1dba Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 27 Apr 2018 12:24:37 -0400 Subject: Add dns config, fix ansible start script Re-add DNS config accidentally removed from sdnc container in docker-compose.yml and fix typos in ansible start script Change-Id: I808d559f68e7348acb5bbddfc089b96168f0f7bf Issue-ID: SDNC-288 Signed-off-by: Timoney, Dan (dt5972) Former-commit-id: f2929453c961b3d6e9a5320b06cd86146a4c636f --- installation/ansible-server/src/main/docker/Dockerfile | 2 +- installation/ansible-server/src/main/scripts/startAnsibleServer.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'installation/ansible-server/src/main') diff --git a/installation/ansible-server/src/main/docker/Dockerfile b/installation/ansible-server/src/main/docker/Dockerfile index 87ae9e79..86b368c9 100644 --- a/installation/ansible-server/src/main/docker/Dockerfile +++ b/installation/ansible-server/src/main/docker/Dockerfile @@ -23,7 +23,7 @@ COPY opt /opt/ WORKDIR /opt/onap/sdnc -ENTRYPOINT exec startAnsibleServer.sh +#ENTRYPOINT exec startAnsibleServer.sh #CMD ["/bin/bash"] EXPOSE 8000 diff --git a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh index e9b912bb..eec62ba6 100644 --- a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh +++ b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh @@ -1,7 +1,7 @@ #/bin/bash exec &> /var/log/ansible-server.log -if [ ! -d /tmp/.ansible-server-installed] +if [ ! -f /tmp/.ansible-server-installed ] then pip install PyMySQL pip install cherrypy -- cgit 1.2.3-korg