Add state repository and remove explicit add repo for remote store in…

…dexes Signed-off-by: Ashish Singh <ssashish@amazon.com>
opensearch-project · Sep 8, 2023 · 1708a07 · 1708a07
1 parent de2874c
commit 1708a07
Showing 1 changed file with 6 additions and 29 deletions.
diff --git a/lib/infra/infra-stack.ts b/lib/infra/infra-stack.ts
@@ -522,6 +522,12 @@ export class InfraStack extends Stack {
           cwd: '/home/ec2-user',
           ignoreErrors: false,
         }));
+
+        // eslint-disable-next-line max-len
+        cfnInitConfig.push(InitCommand.shellCommand(`set -ex;cd opensearch; echo "node.attr.remote_store.state.repository: ${scope.stackName}-repo" >> config/opensearch.yml`, {
+          cwd: '/home/ec2-user',
+          ignoreErrors: false,
+        }));
       }
     }
 
@@ -585,35 +591,6 @@ export class InfraStack extends Stack {
         }));
     }
 
-    if (props.enableRemoteStore) {
-      // Snapshot creation call should be done from one node to avoid any race condition, using seed node.
-      if (nodeType === 'seed-manager' || nodeType === 'seed-data') {
-        if (props.securityDisabled) {
-          // eslint-disable-next-line max-len
-          cfnInitConfig.push(InitCommand.shellCommand(`set -ex; sleep 60; curl -XPUT "http://localhost:9200/_snapshot/${scope.stackName}-repo" -H 'Content-Type: application/json' -d'
-          {
-            "type": "s3",
-            "settings": {
-              "bucket": "${scope.stackName}",
-              "region": "${scope.region}",
-              "base_path": "remote-store"
-            }
-          }'`));
-        } else {
-          // eslint-disable-next-line max-len
-          cfnInitConfig.push(InitCommand.shellCommand(`set -ex; sleep 60; curl -XPUT "https://localhost:9200/_snapshot/${scope.stackName}-repo" -ku admin:admin -H 'Content-Type: application/json' -d'
-          {
-            "type": "s3",
-            "settings": {
-              "bucket": "${scope.stackName}",
-              "region": "${scope.region}",
-              "base_path": "remote-store"
-            }
-          }'`));
-        }
-      }
-    }
-
     // If OSD Url is present
     if (props.dashboardsUrl !== 'undefined') {
       cfnInitConfig.push(InitCommand.shellCommand(`set -ex;mkdir opensearch-dashboards; curl -L ${props.dashboardsUrl} -o opensearch-dashboards.tar.gz;`