From 22965babe42fc388e971bb1c2be8fe0eeba24051 Mon Sep 17 00:00:00 2001 From: Yi Tseng Date: Sat, 7 Jul 2018 23:28:52 +0800 Subject: [PATCH] Fix incorrect nova config init script nova-console-compute-init.sh and nove_consolt-proxy-init.sh generates incorrect configuration if there exists multiple IP address on default interface. To solve this problem, we pickup first IP address if there exists multiple IP on that interface. Change-Id: Iaadd2e71d624122e68fdd628771df21cd61c0784 --- nova/templates/bin/_nova-console-compute-init.sh.tpl | 2 +- nova/templates/bin/_nova-console-proxy-init.sh.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/templates/bin/_nova-console-compute-init.sh.tpl b/nova/templates/bin/_nova-console-compute-init.sh.tpl index 24c3b4312d..aa94ca118a 100644 --- a/nova/templates/bin/_nova-console-compute-init.sh.tpl +++ b/nova/templates/bin/_nova-console-compute-init.sh.tpl @@ -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 diff --git a/nova/templates/bin/_nova-console-proxy-init.sh.tpl b/nova/templates/bin/_nova-console-proxy-init.sh.tpl index 37000e651c..9bed70dcbf 100644 --- a/nova/templates/bin/_nova-console-proxy-init.sh.tpl +++ b/nova/templates/bin/_nova-console-proxy-init.sh.tpl @@ -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 </tmp/pod-shared/nova-spice.ini server_proxyclient_address = $client_address server_listen = $listen_ip EOF -fi \ No newline at end of file +fi