Removing debugging steps, adding in etcd_server variable check