From 36c8fe0b26c713037b5422f68297f124b1aa26a0 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Tue, 10 Mar 2015 16:08:03 +0000 Subject: Set novncproxy server ip in nova.conf The ip of the compute node is gotten from the bridge device and this value is set in the novncproxy configuration in nova.conf. This is required for horizon to access to the compute node so have access to the VMs created on it. Also: - remove /usr/share/vnc which is now created in the vnc chunk. - add explicity where to find novnc client to nova-novncproxy systemd unit. --- openstack/usr/share/openstack/openstack-nova-setup | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'openstack/usr/share/openstack/openstack-nova-setup') diff --git a/openstack/usr/share/openstack/openstack-nova-setup b/openstack/usr/share/openstack/openstack-nova-setup index 7168e7c2..1a93a1b0 100644 --- a/openstack/usr/share/openstack/openstack-nova-setup +++ b/openstack/usr/share/openstack/openstack-nova-setup @@ -76,11 +76,10 @@ if ! sudo -u postgres psql -lqt | grep -q nova; then sudo -u nova nova-manage db sync fi -# Nova novncproxy needs /usr/share/novnc folder available -if [ ! -d /usr/share/novnc ]; then - mkdir /usr/share/novnc - chown -R nova:nova /usr/share/novnc -fi +# Nova novncproxy needs to know the ip of the novnc host +# this is a workaround to make nova known which is the novnc host +eth_ip="$(ip addr | perl -pe 'if (/^\d+: ([^:]+)/) { $iface=$1; } if (m@^\s*inet ([^/]+)/@) { print "$iface $1\n"; } $_=undef;' | grep "^br-eth0" | head -1 | awk '{ print $2 } ')" +sed -i "s/\#\#NOVNC_HOST\#\#/$eth_ip/g" /etc/nova/nova.conf chown -R nova:nova /var/lib/nova -- cgit v1.2.1