Fix machine id issues

Use equality for machine id tests
use any allocated and ready node
remove some unused and confusing code.

Signed-off-by: Michael McCracken <mike.mccracken@canonical.com>