From b9a2a29a9e1e93cd04bfa46f9ed66a2117ef56e5 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 3 Aug 2018 07:56:14 -0700 Subject: Refactor ONAP HEAT template config, part 2 Change-Id: Ic4930654395ec9e9d57836733cd47e7a3b0bf972 Issue-ID: INT-605 Signed-off-by: Gary Wu --- heat/ONAP/cloud-config/dcae2_install.sh | 60 ++------------------------------- 1 file changed, 3 insertions(+), 57 deletions(-) mode change 100755 => 100644 heat/ONAP/cloud-config/dcae2_install.sh (limited to 'heat/ONAP/cloud-config/dcae2_install.sh') diff --git a/heat/ONAP/cloud-config/dcae2_install.sh b/heat/ONAP/cloud-config/dcae2_install.sh old mode 100755 new mode 100644 index d0f5fd6e..a4fd556a --- a/heat/ONAP/cloud-config/dcae2_install.sh +++ b/heat/ONAP/cloud-config/dcae2_install.sh @@ -19,9 +19,6 @@ set -ex # Read configuration files -ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) -CLOUD_ENV=$(cat /opt/config/cloud_env.txt) EXTERNAL_DNS=$(cat /opt/config/external_dns.txt) MAC_ADDR=$(cat /opt/config/mac_addr.txt) HTTP_PROXY=$(cat /opt/config/http_proxy.txt) @@ -33,65 +30,18 @@ then export https_proxy=$HTTPS_PROXY fi -MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - -if [[ $CLOUD_ENV != "rackspace" ]] -then - # Add host name to /etc/host to avoid warnings in openstack images - echo "127.0.0.1 $(hostname)" >> /etc/hosts - - # Allow remote login as root - mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk - cp /home/ubuntu/.ssh/authorized_keys /root/.ssh -fi # Download dependencies apt-get update -#apt-get install -y apt-transport-https ca-certificates wget make git ntp ntpdate python python-pip -apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate python python-pip +apt-get install -y python python-pip # Download scripts from Nexus -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae2_vm_init.sh > /opt/dcae2_vm_init.sh -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/dcae2_serv.sh -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh -chmod +x /opt/imagetest.sh +cp /opt/boot/dcae2_vm_init.sh /opt/dcae2_vm_init.sh chmod +x /opt/dcae2_vm_init.sh -chmod +x /opt/dcae2_serv.sh -sed -i "s|cmd=\"\"|cmd=\"./dcae2_vm_init.sh\"|g" /opt/dcae2_serv.sh -mv /opt/dcae2_serv.sh /etc/init.d update-rc.d dcae2_serv.sh defaults -# Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list -apt-get update -apt-get install -y "linux-image-extra-$(uname -r)" linux-image-extra-virtual jq -apt-get install -y --allow-unauthenticated docker-engine - -mkdir -p /opt/docker -curl -L "https://github.com/docker/compose/releases/download/1.9.0/docker-compose-$(uname -s)-$(uname -m)" > /opt/docker/docker-compose -chmod +x /opt/docker/docker-compose - -# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may -# need to know the external DNS IP -DNS_FLAG="" -if [ -s /opt/config/dns_ip_addr.txt ] -then - DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) " -fi -if [ -s /opt/config/external_dns.txt ] -then - DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) " -fi -echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\"" >> /etc/default/docker - -cp /lib/systemd/system/docker.service /etc/systemd/system -sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service +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 [ $HTTP_PROXY != "no_proxy" ] -then -cd /opt -./imagetest.sh -fi systemctl daemon-reload service docker restart @@ -99,10 +49,6 @@ service docker restart echo "$(cat /opt/config/dcae_ip_addr.txt) consul" >>/etc/hosts echo "$(cat /opt/config/dcae_ip_addr.txt) dockerhost" >>/etc/hosts -# DNS IP address configuration -echo "nameserver $DNS_IP_ADDR" >> /etc/resolvconf/resolv.conf.d/head -resolvconf -u - # prepare the configurations needed by DCAEGEN2 installer rm -rf /opt/app/config mkdir -p /opt/app/config -- cgit 1.2.3-korg