openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Optimize opendaylight_api container healhcheck" into stable/pike

This commit is contained in:
Zuul 2017-11-24 13:44:46 +00:00 committed by Gerrit Code Review
parent 321ff67de5 3e2910a9ab
commit 21369bb806
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
healthcheck/opendaylight-api
View File

@ -2,10 +2,8 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
username=$(get_config_val /opt/opendaylight/etc/org.jolokia.osgi.cfg DEFAULT org.jolokia.user admin)
password=$(get_config_val /opt/opendaylight/etc/org.jolokia.osgi.cfg DEFAULT org.jolokia.password admin)
bind_host=$(grep -r '<Set name="host">' "/opt/opendaylight/etc/jetty.xml" | awk -F'>' FNR==1'{print $2}')
bind_port=$(grep -r '<Property name="jetty.port" default=' "/opt/opendaylight/etc/jetty.xml" | awk FNR==2'{print $3}' | cut -d'"' -f2)
odl_check_url=restconf/operational/network-topology:network-topology/topology/netvirt:1
file=/opt/opendaylight/etc/jetty.xml
bind_host=$(grep -r '<Set name="host">' $file | awk -F'>' FNR==1'{print $2}')
bind_port=$(grep -r '<Property name="jetty.port" default=' $file | awk FNR==2'{print $3}' | cut -d'"' -f2)
healthcheck_curl -u $username:$password http://$bind_host:$bind_port/$odl_check_url
healthcheck_curl http://$bind_host:$bind_port/index.html