diff --git a/README.md b/README.md index 1ed53e40ac8..b8eb8df470f 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ cdk synth "*" --context securityDisabled=false \ --context distVersion=2.3.0 --context serverAccessType=ipv4 --context restrictServerAccessTo=10.10.10.10/32 ``` -#### Sample command to set up multi-node cluster with security disabled on x64 AL2 machine +#### Sample command to set up multi-node cluster with security enabled on x64 AL2 machine Please note that as of now we only support instances backed by Amazon Linux-2 amis. diff --git a/lib/infra/infra-stack.ts b/lib/infra/infra-stack.ts index 00e0d5760ca..6d43cbb3355 100644 --- a/lib/infra/infra-stack.ts +++ b/lib/infra/infra-stack.ts @@ -59,16 +59,16 @@ export interface infraProps extends StackProps { readonly mlNodeCount: number, readonly dataNodeStorage: number, readonly mlNodeStorage: number, - readonly jvmSysPropsString?: string, - readonly additionalConfig?: string, - readonly additionalOsdConfig?: string, readonly dataEc2InstanceType: InstanceType, readonly mlEc2InstanceType: InstanceType, readonly use50PercentHeap: boolean, readonly isInternal: boolean, readonly enableRemoteStore: boolean, readonly storageVolumeType: EbsDeviceVolumeType, - readonly customRoleArn: string + readonly customRoleArn: string, + readonly jvmSysPropsString?: string, + readonly additionalConfig?: string, + readonly additionalOsdConfig?: string, } export class InfraStack extends Stack { diff --git a/lib/os-cluster-entrypoint.ts b/lib/os-cluster-entrypoint.ts index 5ddea5d6ee9..a022432197a 100644 --- a/lib/os-cluster-entrypoint.ts +++ b/lib/os-cluster-entrypoint.ts @@ -249,13 +249,13 @@ export class OsClusterEntrypoint { securityDisabled: security, opensearchVersion: distVersion, clientNodeCount: clientCount, - cpuArch, + cpuArch: cpuArch, cpuType: instanceCpuType, - dataEc2InstanceType, - mlEc2InstanceType, + dataEc2InstanceType: dataEc2InstanceType, + mlEc2InstanceType: mlEc2InstanceType, dashboardsUrl: dashboardUrl, dataNodeCount: dataCount, - distributionUrl, + distributionUrl: distributionUrl, ingestNodeCount: ingestCount, managerNodeCount: managerCount, minDistribution: minDist, @@ -263,16 +263,16 @@ export class OsClusterEntrypoint { // @ts-ignore securityGroup: this.securityGroup, singleNodeCluster: isSingleNode, - dataNodeStorage, - mlNodeStorage, + dataNodeStorage: dataNodeStorage, + mlNodeStorage: mlNodeStorage, + use50PercentHeap: use50PercentHeap, + isInternal: isInternal, + enableRemoteStore: enableRemoteStore, + storageVolumeType: volumeType, + customRoleArn: customRoleArn, jvmSysPropsString: jvmSysProps, additionalConfig: ymlConfig, additionalOsdConfig: osdYmlConfig, - use50PercentHeap, - isInternal, - enableRemoteStore, - storageVolumeType: volumeType, - customRoleArn, ...props, });