diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-09-18 16:44:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-18 16:44:21 +0000 |
| commit | 23a18fbae28155c5b301615d3e1bca0065e12af0 (patch) | |
| tree | f2937f02f4dc0ac02efa0b52f8d50d25862e6d3e /heat/ONAP/cloud-config/dcae2_install.sh | |
| parent | 6f30a58c16b3ea02d50e81d53bb03cd639b82b98 (diff) | |
| parent | 30576033acda31e499bf15b2fa5d2f5c1eb3d296 (diff) | |
Merge "Remove deprecated R1 code"
Diffstat (limited to 'heat/ONAP/cloud-config/dcae2_install.sh')
| -rw-r--r-- | heat/ONAP/cloud-config/dcae2_install.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/heat/ONAP/cloud-config/dcae2_install.sh b/heat/ONAP/cloud-config/dcae2_install.sh index fbc8db3c..e7d72df5 100644 --- a/heat/ONAP/cloud-config/dcae2_install.sh +++ b/heat/ONAP/cloud-config/dcae2_install.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################# # -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -39,22 +39,21 @@ apt-get install -y python python-pip cp /opt/boot/dcae2_vm_init.sh /opt/dcae2_vm_init.sh chmod +x /opt/dcae2_vm_init.sh -echo "DOCKER_OPTS=\"\$DOCKER_OPTS --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\"" >> /etc/default/docker +echo "DOCKER_OPTS=\" $DOCKER_OPTS --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\" " >> /etc/default/docker sed -i "/ExecStart/s/$/ -H tcp:\/\/0.0.0.0:2376 --raw-logs/g" /etc/systemd/system/docker.service +if [ ! -e /etc/docker/daemon.json ]; then + REGISTRY="$(cat /opt/config/nexus_docker_repo.txt)" + if [[ $REGISTRY != nexus3.onap.org* ]]; then + echo "{ \"insecure-registries\" : [\"${REGISTRY}\"] }" > /etc/docker/daemon.json + fi +fi systemctl daemon-reload service docker restart -# add hostname aliases -echo "$(cat /opt/config/dcae_ip_addr.txt) consul" >>/etc/hosts -echo "$(cat /opt/config/dcae_ip_addr.txt) dockerhost" >>/etc/hosts - # prepare the configurations needed by DCAEGEN2 installer rm -rf /opt/app/config mkdir -p /opt/app/config -# private key -sed -e 's/\\n/\n/g' /opt/config/priv_key | sed -e 's/^[ \t]*//g; s/[ \t]*$//g' > /opt/app/config/key -chmod 777 /opt/app/config/key cd /opt ./dcae2_vm_init.sh |