summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAndrew Gauld <ag1282@att.com>2017-08-24 16:46:17 -0400
committerAndrew Gauld <ag1282@att.com>2017-08-25 09:15:51 -0400
commitb34cbd016aed9717bc275923a677638a45842355 (patch)
tree9d90e33a6b0ff5e81724904f279a149b1efa4ef6 /scripts
parent4e7e20ec06a7d861a2723a454f123ce562bbce73 (diff)
Add pom.xml & build script, minor cleanup
Change-Id: I484b0a4693f34d242eb5e46a4354f9b86832662a Issue-Id: DCAEGEN2-78 Signed-off-by: Andrew Gauld <ag1282@att.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/cdap-init.sh8
-rw-r--r--scripts/instconsulagentub16.sh6
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/cdap-init.sh b/scripts/cdap-init.sh
index 2484f53..d4f1715 100644
--- a/scripts/cdap-init.sh
+++ b/scripts/cdap-init.sh
@@ -6,9 +6,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -135,7 +135,7 @@ with open('/etc/hosts', 'a') as f:
for index in range(0, count):
hn=fqdns[index][0: fqdns[index].index('.')]
f.write("{ip} {fqdn} {hn}\n".format(ip=localips[index],hn=hn,fqdn=fqdns[index]))
-
+
def pxc(f, m):
a = "<?xml version='1.0' encoding='UTF-8'?>\n<?xml-stylesheet type='text/xsl' href='configuration.xsl'?>\n<configuration>"
for n in m.keys():
@@ -345,7 +345,7 @@ then
su - hive -c 'nohup /usr/hdp/current/hive-metastore/bin/hive --service metastore >>/var/log/hive/hive.out 2>>/var/log/hive/hive.log </dev/null &'
(cd /bin; wget https://raw.githubusercontent.com/caskdata/cdap-monitoring-tools/develop/nagios/check_cdap/bin/check_cdap)
chmod 755 /bin/check_cdap
- wget -qO- $CODE_SOURCE/${CODE_VERSION}-raw/cloud_init/instconsulagentub16.sh >/tmp/cinst.sh
+ wget -qO- $CODE_SOURCE/${CODE_VERSION}/raw/cloud_init/instconsulagentub16.sh >/tmp/cinst.sh
bash /tmp/cinst.sh <<!EOF
{
"bind_addr": "0.0.0.0",
diff --git a/scripts/instconsulagentub16.sh b/scripts/instconsulagentub16.sh
index 53d9099..3b84b30 100644
--- a/scripts/instconsulagentub16.sh
+++ b/scripts/instconsulagentub16.sh
@@ -7,9 +7,9 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@ ExecReload=/bin/kill -HUP \$MAINPID
WantedBy=multi-user.target
EOF
systemctl enable consul
-systemctl start consul
+systemctl start consul
until /opt/consul/bin/consul join "dcae-cnsl"
do
echo Waiting to join Consul cluster