summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaneyon Hansen <danehans@cisco.com>2015-05-07 16:18:34 +0000
committerDaneyon Hansen <danehans@cisco.com>2015-05-07 16:18:34 +0000
commit8b6d7b44b8a5adb6078ab3ffa1ddec67968e5699 (patch)
treeb270c2d3cecb6fc73dd38cb7ae2dfc2d2a70c574
parentbd0fd9502e0efa8abecf9203ee04e92075bf8b78 (diff)
downloadkolla-8b6d7b44b8a5adb6078ab3ffa1ddec67968e5699.tar.gz
kolla-8b6d7b44b8a5adb6078ab3ffa1ddec67968e5699.zip
Fixes Nova NOVNC and Consoleauth Startup Failure
Previously these services would not start because the start script requires the associated log file to exist. The default settings for these 2 log files are blank causing the failure. Since the log files are not required for the services to start, this patch removes the parameter requirement from both start scripts. Change-Id: I84d3d128728075e52282b49d9df229917a34a7b5
-rwxr-xr-xdocker/nova-controller/nova-consoleauth/start.sh2
-rwxr-xr-xdocker/nova-controller/nova-novncproxy/start.sh2
2 files changed, 1 insertions, 3 deletions
diff --git a/docker/nova-controller/nova-consoleauth/start.sh b/docker/nova-controller/nova-consoleauth/start.sh
index fbac5d4b5..a1b0864ac 100755
--- a/docker/nova-controller/nova-consoleauth/start.sh
+++ b/docker/nova-controller/nova-consoleauth/start.sh
@@ -5,8 +5,6 @@ set -e
cfg=/etc/nova/nova.conf
-check_required_vars NOVA_CONSOLEAUTH_LOG_FILE
-
crudini --set $cfg DEFAULT log_file "${NOVA_CONSOLEAUTH_LOG_FILE}"
echo Starting nova-consoleauth
diff --git a/docker/nova-controller/nova-novncproxy/start.sh b/docker/nova-controller/nova-novncproxy/start.sh
index 95a474719..e8aea8f79 100755
--- a/docker/nova-controller/nova-novncproxy/start.sh
+++ b/docker/nova-controller/nova-novncproxy/start.sh
@@ -5,7 +5,7 @@ set -e
cfg=/etc/nova/nova.conf
check_required_vars PUBLIC_IP NOVA_NOVNC_PROXY_SERVICE_HOST NOVA_NOVNC_PROXY_PORT \
- NOVA_NOVNC_BASE_ADDRESS NOVA_NOVNCPROXY_LOG_FILE
+ NOVA_NOVNC_BASE_ADDRESS
crudini --set $cfg DEFAULT log_file "${NOVA_NOVNCPROXY_LOG_FILE}"