@@ -541,19 +541,21 @@ function create_nova_conf {

     # Setup logging for nova-dhcpbridge command line

     sudo cp "$NOVA_CONF" "$NOVA_CONF_DIR/nova-dhcpbridge.conf"

-    local service="n-dhcp"

-    local logfile="${service}.log.${CURRENT_LOG_TIME}"

-    local real_logfile="${LOGDIR}/${logfile}"

-    if [[ -n ${LOGDIR} ]]; then

-        bash -c "cd '$LOGDIR' && ln -sf '$logfile' ${service}.log"

-        iniset "$NOVA_CONF_DIR/nova-dhcpbridge.conf" DEFAULT log_file "$real_logfile"

-        if [[ -n ${SCREEN_LOGDIR} ]]; then

-            # Drop the backward-compat symlink

-            ln -sf "$real_logfile" ${SCREEN_LOGDIR}/screen-${service}.log

+    if is_service_enabled n-net; then

+        local service="n-dhcp"

+        local logfile="${service}.log.${CURRENT_LOG_TIME}"

+        local real_logfile="${LOGDIR}/${logfile}"

+        if [[ -n ${LOGDIR} ]]; then

+            bash -c "cd '$LOGDIR' && ln -sf '$logfile' ${service}.log"

+            iniset "$NOVA_CONF_DIR/nova-dhcpbridge.conf" DEFAULT log_file "$real_logfile"

+            if [[ -n ${SCREEN_LOGDIR} ]]; then

+                # Drop the backward-compat symlink

+                ln -sf "$real_logfile" ${SCREEN_LOGDIR}/screen-${service}.log

+            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

         init_nova_service_user_conf