diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-27 12:24:37 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-27 12:37:56 -0400 |
| commit | 1c7e45507c7686a236cf5f23bb572142d8be1dba (patch) | |
| tree | 25a25459e949b75b5c749cd5f4c7171cf3f6c880 | |
| parent | 9b844cb5985a1a573a1ed43990aac3282547b2ce (diff) | |
Add dns config, fix ansible start scriptv1.3.1
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) <dt5972@att.com>
Former-commit-id: f2929453c961b3d6e9a5320b06cd86146a4c636f
3 files changed, 4 insertions, 2 deletions
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 diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index f2cc5a2d..361e7ea8 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -59,6 +59,8 @@ services: environment: - MYSQL_ROOT_PASSWORD=openECOMP1.0 - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties + dns: + - ${DNS_IP_ADDR-10.0.100.1} logging: driver: "json-file" options: |