openstack/devstack
Code Issues Proposed changes

Only setup nova-dhcpbridge if using nova-network

Browse Source 
Closes-Bug: #1705324

Change-Id: I3abc84483bbd256e0bbbfe64d570903080f2a2b7
This commit is contained in:
Matt Riedemann 2017-07-19 14:01:22 -04:00
parent d93433dfb8
commit ecbebd5d7b
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/nova
View File

@ -541,19 +541,21 @@ function create_nova_conf {
# Setup logging for nova-dhcpbridge command line # Setup logging for nova-dhcpbridge command line
sudo cp "$NOVA_CONF" "$NOVA_CONF_DIR/nova-dhcpbridge.conf" sudo cp "$NOVA_CONF" "$NOVA_CONF_DIR/nova-dhcpbridge.conf"
local service="n-dhcp" if is_service_enabled n-net; then
local logfile="${service}.log.${CURRENT_LOG_TIME}" local service="n-dhcp"
local real_logfile="${LOGDIR}/${logfile}" local logfile="${service}.log.${CURRENT_LOG_TIME}"
if [[ -n ${LOGDIR} ]]; then local real_logfile="${LOGDIR}/${logfile}"
bash -c "cd '$LOGDIR' && ln -sf '$logfile' ${service}.log" if [[ -n ${LOGDIR} ]]; then
iniset "$NOVA_CONF_DIR/nova-dhcpbridge.conf" DEFAULT log_file "$real_logfile" bash -c "cd '$LOGDIR' && ln -sf '$logfile' ${service}.log"
if [[ -n ${SCREEN_LOGDIR} ]]; then iniset "$NOVA_CONF_DIR/nova-dhcpbridge.conf" DEFAULT log_file "$real_logfile"
# Drop the backward-compat symlink if [[ -n ${SCREEN_LOGDIR} ]]; then
ln -sf "$real_logfile" ${SCREEN_LOGDIR}/screen-${service}.log # Drop the backward-compat symlink
ln -sf "$real_logfile" ${SCREEN_LOGDIR}/screen-${service}.log
fi
fi fi
fi
iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF_DIR/nova-dhcpbridge.conf" iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF_DIR/nova-dhcpbridge.conf"
fi
if [ "$NOVA_USE_SERVICE_TOKEN" == "True" ]; then if [ "$NOVA_USE_SERVICE_TOKEN" == "True" ]; then
init_nova_service_user_conf init_nova_service_user_conf