Could this be a one-liner? Something like 

    bootstrap.config[:chef_node_name] = locate_config_value(:saveip) ? ip_address : locate_config_value(:server_name)

Also, my gut feeling is that it should be `:save_ip`, not `:saveip` -- both here, and when the option is declared.