From 1951ee4f75821702845cbf84243f7aadd032fd53 Mon Sep 17 00:00:00 2001
From: davidplunkett <dp7642@att.com>
Date: Wed, 27 Mar 2019 00:01:11 +0000
Subject: [PATCH] add exit on error and remove unsed code/comments

Change-Id: If21d4ffa163eee9672a7461e0068c19c504c06ce
Signed-off-by: davidplunkett <dp7642@att.com>
---
 tools/1prom-gen.sh    | 79 +--------------------------------------------------
 tools/2genesis.sh     |  2 +-
 tools/3deploy_site.sh |  2 +-
 3 files changed, 3 insertions(+), 80 deletions(-)

diff --git a/tools/1prom-gen.sh b/tools/1prom-gen.sh
index 30f37fa..68ab018 100755
--- a/tools/1prom-gen.sh
+++ b/tools/1prom-gen.sh
@@ -18,7 +18,7 @@
 
 # re-generate prom config
 
-set -x
+set -xe
 TIMESTAMP=$(date +"%Y%m%d%H%M")
 echo "logging to /var/log/yaml_builds/1prom-gen_$TIMESTAMP.log"
 mkdir -p /var/log/yaml_builds
@@ -63,82 +63,6 @@ else
   cd $YAML_BUILDS
 fi
 
-install_docker() {
-   # Configure proxy for Docker daemon
-   mkdir -p /etc/systemd/system/docker.service.d
-   mkdir -p /etc/docker
-
-cat <<EOF > /etc/apt/sources.list.d/promenade-sources.list
-deb http://apt.dockerproject.org/repo ubuntu-xenial main
-EOF
-
-#cat<<EOF > /etc/docker/daemon.json
-#{
-#  "insecure-registries": [
-#    "artifacts-aic.atlantafoundry.com"
-#  ],
-#  "live-restore": true,
-#  "storage-driver": "overlay2"
-#}
-#EOF
-
-cat<<EOF > /etc/docker/daemon.json
-{
-  "live-restore": true,
-  "storage-driver": "overlay2"
-}
-EOF
-
-#Set HTTPS Proxy Variable
-cat <<EOF > /etc/systemd/system/docker.service.d/http-proxy.conf
-[Service]
-Environment="HTTP_PROXY=http://one.proxy.att.com:8888"
-EOF
-
-#Set HTTPS Proxy Variable
-cat <<EOF > /etc/systemd/system/docker.service.d/https-proxy.conf
-[Service]
-Environment="HTTPS_PROXY=http://one.proxy.att.com:8888"
-EOF
-
-apt-key add - <<"ENDKEY"
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFWln24BEADrBl5p99uKh8+rpvqJ48u4eTtjeXAWbslJotmC/CakbNSqOb9o
-ddfzRvGVeJVERt/Q/mlvEqgnyTQy+e6oEYN2Y2kqXceUhXagThnqCoxcEJ3+KM4R
-mYdoe/BJ/J/6rHOjq7Omk24z2qB3RU1uAv57iY5VGw5p45uZB4C4pNNsBJXoCvPn
-TGAs/7IrekFZDDgVraPx/hdiwopQ8NltSfZCyu/jPpWFK28TR8yfVlzYFwibj5WK
-dHM7ZTqlA1tHIG+agyPf3Rae0jPMsHR6q+arXVwMccyOi+ULU0z8mHUJ3iEMIrpT
-X+80KaN/ZjibfsBOCjcfiJSB/acn4nxQQgNZigna32velafhQivsNREFeJpzENiG
-HOoyC6qVeOgKrRiKxzymj0FIMLru/iFF5pSWcBQB7PYlt8J0G80lAcPr6VCiN+4c
-NKv03SdvA69dCOj79PuO9IIvQsJXsSq96HB+TeEmmL+xSdpGtGdCJHHM1fDeCqkZ
-hT+RtBGQL2SEdWjxbF43oQopocT8cHvyX6Zaltn0svoGs+wX3Z/H6/8P5anog43U
-65c0A+64Jj00rNDr8j31izhtQMRo892kGeQAaaxg4Pz6HnS7hRC+cOMHUU4HA7iM
-zHrouAdYeTZeZEQOA7SxtCME9ZnGwe2grxPXh/U/80WJGkzLFNcTKdv+rwARAQAB
-tDdEb2NrZXIgUmVsZWFzZSBUb29sIChyZWxlYXNlZG9ja2VyKSA8ZG9ja2VyQGRv
-Y2tlci5jb20+iQI4BBMBAgAiBQJVpZ9uAhsvBgsJCAcDAgYVCAIJCgsEFgIDAQIe
-AQIXgAAKCRD3YiFXLFJgnbRfEAC9Uai7Rv20QIDlDogRzd+Vebg4ahyoUdj0CH+n
-Ak40RIoq6G26u1e+sdgjpCa8jF6vrx+smpgd1HeJdmpahUX0XN3X9f9qU9oj9A4I
-1WDalRWJh+tP5WNv2ySy6AwcP9QnjuBMRTnTK27pk1sEMg9oJHK5p+ts8hlSC4Sl
-uyMKH5NMVy9c+A9yqq9NF6M6d6/ehKfBFFLG9BX+XLBATvf1ZemGVHQusCQebTGv
-0C0V9yqtdPdRWVIEhHxyNHATaVYOafTj/EF0lDxLl6zDT6trRV5n9F1VCEh4Aal8
-L5MxVPcIZVO7NHT2EkQgn8CvWjV3oKl2GopZF8V4XdJRl90U/WDv/6cmfI08GkzD
-YBHhS8ULWRFwGKobsSTyIvnbk4NtKdnTGyTJCQ8+6i52s+C54PiNgfj2ieNn6oOR
-7d+bNCcG1CdOYY+ZXVOcsjl73UYvtJrO0Rl/NpYERkZ5d/tzw4jZ6FCXgggA/Zxc
-jk6Y1ZvIm8Mt8wLRFH9Nww+FVsCtaCXJLP8DlJLASMD9rl5QS9Ku3u7ZNrr5HWXP
-HXITX660jglyshch6CWeiUATqjIAzkEQom/kEnOrvJAtkypRJ59vYQOedZ1sFVEL
-MXg2UCkD/FwojfnVtjzYaTCeGwFQeqzHmM241iuOmBYPeyTY5veF49aBJA1gEJOQ
-TvBR8Q==
-=Fm3p
------END PGP PUBLIC KEY BLOCK-----
-ENDKEY
-
-   apt-get update
-   apt-get install -y docker-engine=1.13.1-0~ubuntu-xenial socat=1.7.3.1-1
-   systemctl daemon-reload
-   systemctl restart docker || true
-}
-
 create_directories() {
    mkdir -p ./tars/$SITE/configs/promenade
    mkdir -p ./tars/$SITE/configs/promenade-bundle
@@ -184,7 +108,6 @@ prepare_tar(){
    tar cvf ./tars/promenade-bundle-$SITE.tar -C ./tars/$SITE .
 }
 
-#install_docker
 create_directories
 get_site_config
 gen_certs
diff --git a/tools/2genesis.sh b/tools/2genesis.sh
index 7442945..5f76311 100755
--- a/tools/2genesis.sh
+++ b/tools/2genesis.sh
@@ -15,7 +15,7 @@
 # limitations under the License.                                             #
 ##############################################################################
 
-set -x
+set -xe
 TIMESTAMP=$(date +"%Y%m%d%H%M")
 echo "Logging to /var/log/yaml_builds/2genesis_$TIMESTAMP.log"
 mkdir -p /var/log/yaml_builds
diff --git a/tools/3deploy_site.sh b/tools/3deploy_site.sh
index 5f30f0e..5b10c9c 100755
--- a/tools/3deploy_site.sh
+++ b/tools/3deploy_site.sh
@@ -16,7 +16,7 @@
 ##############################################################################
 
 
-set -x
+set -xe
 
 source $(dirname $0)/setenv.sh
 
-- 
2.16.6