openstack/zun
Code Issues Proposed changes

devstack: restore xtrace in zun nova lib

Browse Source 
Change-Id: I196efbffbeb22b18ee07b6392373c877d9e1117b
This commit is contained in:
Eli Qiao 2017-02-22 16:01:54 +08:00
parent e35701be4b
commit 6251630dec
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/lib/nova
View File

@ -13,7 +13,7 @@
# - configure_nova_docker # - configure_nova_docker
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) _XTRACE_ZUN_NOVA=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
# Defaults # Defaults
@ -58,3 +58,6 @@ function configure_nova_docker {
local rootwrap_conf_src_dir="$DEST/zun/etc/nova" local rootwrap_conf_src_dir="$DEST/zun/etc/nova"
sudo install -o root -g root -m 644 $rootwrap_conf_src_dir/rootwrap.d/*.filters /etc/nova/rootwrap.d sudo install -o root -g root -m 644 $rootwrap_conf_src_dir/rootwrap.d/*.filters /etc/nova/rootwrap.d
} }
# Restore xtrace
$_XTRACE_ZUN_NOVA

2
devstack/lib/zun
View File

@ -44,7 +44,7 @@ ZUN_CONF_DIR=/etc/zun
ZUN_CONF=$ZUN_CONF_DIR/zun.conf ZUN_CONF=$ZUN_CONF_DIR/zun.conf
ZUN_POLICY_JSON=$ZUN_CONF_DIR/policy.json ZUN_POLICY_JSON=$ZUN_CONF_DIR/policy.json
ZUN_API_PASTE=$ZUN_CONF_DIR/api-paste.ini ZUN_API_PASTE=$ZUN_CONF_DIR/api-paste.ini
if is_ssl_enabled_service "zun" || is_service_enabled tls-proxy; then if is_ssl_enabled_service "zun" || is_service_enabled tls-proxy; then
ZUN_SERVICE_PROTOCOL="https" ZUN_SERVICE_PROTOCOL="https"
fi fi