openstack/openstack-helm
Code Issues Proposed changes

Merge "Fix incorrect nova config init script"

Browse Source
This commit is contained in:
Zuul 2018-07-10 13:27:38 +00:00 committed by Gerrit Code Review
commit 3a48b149c5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/templates/bin/_nova-console-compute-init.sh.tpl
View File

@ -37,7 +37,7 @@ if [ -z "${client_address}" ] ; then
fi
# determine client ip dynamically based on interface provided
client_address=$(ip a s $client_interface | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}')
client_address=$(ip a s $client_interface | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}' | head -n 1)
fi
if [ -z "${listen_ip}" ] ; then

4
nova/templates/bin/_nova-console-proxy-init.sh.tpl
View File

@ -37,7 +37,7 @@ if [ -z "${client_address}" ] ; then
fi
# determine client ip dynamically based on interface provided
client_address=$(ip a s $client_interface | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}')
client_address=$(ip a s $client_interface | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}' | head -n 1)
fi
if [ -z "${listen_ip}" ] ; then
@ -56,4 +56,4 @@ cat <<EOF>/tmp/pod-shared/nova-spice.ini
server_proxyclient_address = $client_address
server_listen = $listen_ip
EOF
fi
fi