Improvements to CLI and various fixes for netapp version

Discovery via consul, persist peer list to file

src/model/garage.rs

@@ -61,6 +61,7 @@ impl Garage {
 			background.clone(),
 			replication_mode.replication_factor(),
 			config.rpc_bind_addr,
+			config.rpc_public_addr,
 			config.bootstrap_peers.clone(),
 			config.consul_host.clone(),
 			config.consul_service_name.clone(),
@@ -162,4 +163,9 @@ impl Garage {
 
 		garage
 	}
+
+	/// Use this for shutdown
+	pub fn break_reference_cycles(&self) {
+		self.block_manager.garage.swap(None);
+	}
 }