diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-27 08:55:48 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-04-27 08:55:48 -0400 |
| commit | 9b844cb5985a1a573a1ed43990aac3282547b2ce (patch) | |
| tree | 538f27219e2595bdf74a2c37f250f7c6e47e3e8d /installation/src | |
| parent | 49e275cac824dd6dcd4cbc7ccd5f922419d662f3 (diff) | |
Fix ansible server config
Added ansible server to docker-compose.yml and made a few config changes:
- redirect of output in final exec causes exec to fail. Instead, need
to redirect output in standalone exec line. Redirected to
/var/log/ansible-server.log
- Updated LCM config to use ansiblehost alias to reach ansible
(was incorrectly using 0.0.0.0)
Change-Id: I4b1b6bbc5f3df6f480333d53adda4c8e6e0d6510
Issue-ID: SDNC-288
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Former-commit-id: 50c65c2c7cd92db6d14215114d098b33da5f618d
Diffstat (limited to 'installation/src')
| -rw-r--r-- | installation/src/main/properties/lcm-dg.properties | 2 | ||||
| -rw-r--r-- | installation/src/main/yaml/docker-compose.yml | 23 |
2 files changed, 22 insertions, 3 deletions
diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties index 1e4e4724..d640d7bb 100644 --- a/installation/src/main/properties/lcm-dg.properties +++ b/installation/src/main/properties/lcm-dg.properties @@ -1,4 +1,4 @@ -ansible.agenturl=http://0.0.0.0:8000/Dispatch +ansible.agenturl=http://ansiblehost:8000/Dispatch ansible.user=sdnc ansible.password=sdnc ansible.lcm.localparameters= diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 2a39f216..f2cc5a2d 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -22,11 +22,31 @@ services: max-size: "30m" max-file: "5" + ansible: + image: onap/sdnc-ansible-server-image:latest + depends_on : + - db + container_name: sdnc_ansible_container + entrypoint: ["/opt/onap/sdnc/startAnsibleServer.sh"] + ports: + - "8000" + links: + - db:dbhost + - db:sdnctldb01 + - db:sdnctldb02 + environment: + - MYSQL_ROOT_PASSWORD=openECOMP1.0 + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" sdnc: image: onap/sdnc-image:latest depends_on : - db + - ansible container_name: sdnc_controller_container entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"] ports: @@ -35,11 +55,10 @@ services: - db:dbhost - db:sdnctldb01 - db:sdnctldb02 + - ansible:ansiblehost 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: |