X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae2_install.sh;h=372c25b2b1d19caee9d1b0aa838f721863e2ce05;hb=7f4cdf155a302a8897dace4514ffadf059125da1;hp=99cfd34d30ee33a08d4a3a0aaeeb70ac4eb67f26;hpb=3234c8ffab9faf85fd3bccfa720a3869ba39d13c;p=demo.git

diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh
old mode 100644
new mode 100755
index 99cfd34d..372c25b2
--- a/boot/dcae2_install.sh
+++ b/boot/dcae2_install.sh
@@ -56,7 +56,7 @@ update-rc.d dcae2_serv.sh defaults
 # Download and install docker-engine and docker-compose
 echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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
+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
@@ -75,12 +75,17 @@ 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\"" >> /etc/default/docker
+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
+sed -i "/ExecStart/s/$/ -H tcp:\/\/0.0.0.0:2376 --raw-logs/g" /etc/systemd/system/docker.service
+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
 
 # DNS IP address configuration
 echo "nameserver $DNS_IP_ADDR" >> /etc/resolvconf/resolv.conf.d/head
@@ -99,25 +104,6 @@ chmod 777 /opt/app/config/key
 # move keystone url file
 #cp /opt/config/keystone_url.txt /opt/app/config/keystone_url.txt
 
-# download blueprint input template files
-rm -rf /opt/app/inputs-templates
-mkdir -p /opt/app/inputs-templates
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/inputs.yaml
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/cdapinputs.yaml
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/phinputs.yaml
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/dhinputs.yaml
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/invinputs.yaml
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/vesinput.yaml
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/tcainputs.yaml
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/he-ip.yaml
-wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/hr-ip.yaml
 
-
-# generate blueprint input files
-pip install jinja2
-wget https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.deployments/releases/scripts/detemplate-bpinputs.py && (python detemplate-bpinputs.py /opt/config /opt/app/inputs-templates /opt/app/config; rm detemplate-bpinputs.py)
-
-
-# Run docker containers
 cd /opt
 ./dcae2_vm_init.sh