Initial etcd discovery support