diff options
Diffstat (limited to 'installation')
4 files changed, 27 insertions, 7 deletions
diff --git a/installation/ansible-server/src/main/scripts/RestServer_config b/installation/ansible-server/src/main/scripts/RestServer_config index accfb044..a98d8749 100644 --- a/installation/ansible-server/src/main/scripts/RestServer_config +++ b/installation/ansible-server/src/main/scripts/RestServer_config @@ -17,13 +17,13 @@ # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # * See the License for the specific language governing permissions and # * limitations under the License. -# * +# * # * ECOMP is a trademark and service mark of AT&T Intellectual Property. # * ============LICENSE_END========================================================= # */ # Host definition -ip: 0.0.0.0 +ip: 0.0.0.0 port: 8000 # Security (controls use of TLS encrypton and RestServer authentication) @@ -39,7 +39,7 @@ id: sdnc psswd: sdnc # Mysql -host: localhost +host: dbhost user: sdnc passwd: sdnc db: ansible diff --git a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh index 643bbab2..e9b912bb 100644 --- a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh +++ b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh @@ -1,4 +1,5 @@ #/bin/bash +exec &> /var/log/ansible-server.log if [ ! -d /tmp/.ansible-server-installed] then @@ -13,4 +14,4 @@ then fi cd /opt/onap/sdnc -exec python RestServer.py > RestServer.out
\ No newline at end of file +exec python RestServer.py
\ No newline at end of file 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: |