Merge branch 'dockerfile' of...

Merge branch 'dockerfile' of https://git-codecommit.us-east-1.amazonaws.com/v1/repos/os-indexer into dockerfile

provider/indexer-aws/CloudFormation/Automated/ecs.yml

@@ -52,7 +52,7 @@ Parameters:
     MaxLength: '64'
     AllowedPattern: "^[a-zA-Z]+[0-9a-zA-Z_-]*$"
     ConstraintDescription: Must start with a letter. Only numbers, letters, -, and _ accepted. Max. length 64 characters.
-    Default: os-storage
+    Default: osdu-storage
 
   QueueApplicationName:
     Description: >
@@ -413,11 +413,11 @@ Resources:
             - Name: AWS_REGION
               Value: !Ref Region
             - Name: AWS_QUEUE_INDEXER_NAME
-              Value: !Sub ${Environment}-osdu-${StorageApplicationName}-queue
+              Value: !Sub ${Environment}-${StorageApplicationName}-queue
             - Name: AWS_INDEXER_INDEX_API
               Value: !Sub http://${ECSALB.DNSName}/${IndexerEndpoint}
             - Name: AWS_DEADLETTER_QUEUE_NAME
-              Value: !Sub ${Environment}-osdu-${StorageApplicationName}-dead-letter-queue
+              Value: !Sub ${Environment}-${StorageApplicationName}-dead-letter-queue
             - Name: MAX_INDEX_THREADS
               Value: !Ref MaxThreads
             - Name: MAX_REQUEST_COUNT

provider/indexer-aws/CloudFormation/Master/os-indexer-master.yml

@@ -56,7 +56,7 @@ Parameters:
     MaxLength: '64'
     AllowedPattern: "^[a-zA-Z]+[0-9a-zA-Z_-]*$"
     ConstraintDescription: Must start with a letter. Only numbers, letters, -, and _ accepted. Max. length 64 characters.
-    Default: os-storage
+    Default: osdu-storage
 
   QueueApplicationName:
     Description: >

provider/indexer-aws/CloudFormation/Params/dev.template_configuration.json

@@ -30,7 +30,7 @@
     "ZoneAwarenessEnabled": "false",
     "ElasticsearchVersion": "6.8",
     "EBSVolumeSize": "10",
-    "StorageApplicationName": "os-storage",
+    "StorageApplicationName": "osdu-storage",
     "IndexerEndpoint": "api/indexer/v2/_dps/task-handlers/index-worker",
     "MaxThreads": "50",
     "MaxMessages": "100000"

provider/indexer-aws/CloudFormation/Params/prod.template_configuration.json

@@ -30,7 +30,7 @@
     "ZoneAwarenessEnabled": "false",
     "ElasticsearchVersion": "6.8",
     "EBSVolumeSize": "10",
-    "StorageApplicationName": "os-storage",
+    "StorageApplicationName": "osdu-storage",
     "IndexerEndpoint": "api/indexer/v2/_dps/task-handlers/index-worker",
     "MaxThreads": "50",
     "MaxMessages": "100000"

provider/indexer-aws/CloudFormation/Params/uat.template_configuration.json

@@ -30,7 +30,7 @@
     "ZoneAwarenessEnabled": "false",
     "ElasticsearchVersion": "6.8",
     "EBSVolumeSize": "10",
-    "StorageApplicationName": "os-storage",
+    "StorageApplicationName": "osdu-storage",
     "IndexerEndpoint": "api/indexer/v2/_dps/task-handlers/index-worker",
     "MaxThreads": "50",
     "MaxMessages": "100000"