From 0bca1a5de36be7fd25dc08d6570e30865147887a Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian@neon.tech>
Date: Sat, 4 May 2024 12:33:02 +0000
Subject: [PATCH] Revert "neon_local: only set
 --pageserver-config-override=remote_storage during init, not start"

This reverts commit 511f59336047c35a2388261f8561e192d0ceeec5.
---
 control_plane/src/pageserver.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/control_plane/src/pageserver.rs b/control_plane/src/pageserver.rs
index 01e8087429..c0a366e3b9 100644
--- a/control_plane/src/pageserver.rs
+++ b/control_plane/src/pageserver.rs
@@ -157,6 +157,15 @@ impl PageServerNode {
             }
         }
 
+        if !cli_overrides
+            .iter()
+            .any(|c| c.starts_with("remote_storage"))
+        {
+            overrides.push(format!(
+                "remote_storage={{local_path='../{PAGESERVER_REMOTE_STORAGE_DIR}'}}"
+            ));
+        }
+
         if *http_auth_type != AuthType::Trust || *pg_auth_type != AuthType::Trust {
             // Keys are generated in the toplevel repo dir, pageservers' workdirs
             // are one level below that, so refer to keys with ../
@@ -211,14 +220,6 @@ impl PageServerNode {
             format!("Cannot start pageserver node {node_id} in path that has no string representation: {datadir:?}")
         })?;
         let mut args = self.pageserver_basic_args(config_overrides, datadir_path_str);
-        if !config_overrides
-            .iter()
-            .any(|c| c.starts_with("remote_storage"))
-        {
-            args.push(Cow::Owned(format!(
-                "--pageserver-config-override=remote_storage={{local_path='../{PAGESERVER_REMOTE_STORAGE_DIR}'}}"
-            )));
-        }
         args.push(Cow::Borrowed("--init"));
 
         let init_output = Command::new(self.env.pageserver_bin())