From 111caeb218381ed1ec811646660bb798d5cf57e2 Mon Sep 17 00:00:00 2001
From: Hongbin Lu <hongbin.lu@huawei.com>
Date: Tue, 17 Oct 2017 21:24:41 +0000
Subject: [PATCH] Configure wsproxy base_url in devstack

In devstack setup, zun-ui failed to attach to the container.
This is because the base_url is not configured and the default
value doesn't allow a remote attach. This patch fixed it.

Change-Id: Ie47e424c2e1542a290419df952019363711b9fd0
---
 devstack/lib/zun | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devstack/lib/zun b/devstack/lib/zun
index 013120432..7eea928e5 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -189,6 +189,7 @@ function create_zun_conf {
     iniset $ZUN_CONF etcd etcd_port "$ZUN_ETCD_PORT"
     iniset $ZUN_CONF websocket_proxy wsproxy_port "$ZUN_WEBSOCKET_PROXY_PORT"
     iniset $ZUN_CONF websocket_proxy wsproxy_host "$ZUN_WEBSOCKET_PROXY_IP"
+    iniset $ZUN_CONF websocket_proxy base_url "ws://${SERVICE_HOST}:${ZUN_WEBSOCKET_PROXY_PORT}/"
     iniset $ZUN_CONF api host_ip "$ZUN_SERVICE_HOST"
     iniset $ZUN_CONF api port "$ZUN_SERVICE_PORT"
     iniset $ZUN_CONF docker docker_remote_api_host "$HOST_IP"