Support for FSx ONTAP during tenant onboarding. #258
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Changes to the tenant-onboarding tempates to create FSx ONTAP resources - Adding the private subnet route table to the tenant resources so we can pass it to the FSx file system resource - Have the installer save the AD password to Secrets Manager so we can resolve it in CloudFormation for the storage virtual machine resource - Updates to security groups and IAM policies - Update the DNS hostname custom resource to work for both FSx Windows and FSx ONTAP - Update the user data boot script for Windows to properly mount the storage virtual machine Co-authored-by: netapp-vedantsethia <Vedant.Sethia@netapp.com> Co-authored-by: netapp-dhruv-tyagi <Dhruv.Tyagi@netapp.com>
PoeppingT
reviewed
Jul 26, 2022
Contributor
PoeppingT
left a comment
PoeppingT
left a comment
There was a problem hiding this comment.
Overall LGTM, just a couple small changes required
| - fsx:TagResource | ||
| - fsx:UntagResource | ||
| Resource: | ||
| - !Sub arn:aws:fsx:${AWS::Region}:${AWS::AccountId}:file-system/* |
Contributor
There was a problem hiding this comment.
these should be AWS::Partition to support aws-cn
| Condition: ProvisionFSx | ||
| Properties: | ||
| TemplateURL: !Sub 'https://{{resolve:ssm:/saas-boost/${Environment}/SAAS_BOOST_BUCKET}}.s3.amazonaws.com/tenant-onboarding-fsx.yaml' | ||
| TemplateURL: !Sub 'https://{{resolve:ssm:/saas-boost/${Environment}/SAAS_BOOST_BUCKET}}.s3.${AWS::Region}.amazonaws.com/tenant-onboarding-fsx.yaml' |
Contributor
There was a problem hiding this comment.
similarly this should be AWS::URLSuffix to support aws-cn
Comment on lines
1007
to
1027
| StringBuilder cli = new StringBuilder(); | ||
| cli.append("aws cloudformation create-stack --stack-name "); | ||
| cli.append(stackName); | ||
| cli.append(" --capabilities CAPABILITY_NAMED_IAM CAPABILITY_AUTO_EXPAND --template-url "); | ||
| cli.append(templateUrl); | ||
| cli.append(" --notification-arns "); | ||
| cli.append(ONBOARDING_APP_STACK_SNS); | ||
| cli.append(" --parameters "); | ||
| for (Parameter parameter : templateParameters) { | ||
| cli.append("ParameterKey="); | ||
| cli.append(parameter.parameterKey()); | ||
| cli.append(",ParameterValue=\""); | ||
| cli.append(parameter.parameterValue()); | ||
| cli.append("\" "); | ||
| } | ||
| LOGGER.info(cli.toString()); | ||
| String stackId; | ||
| try { | ||
| CreateStackResponse cfnResponse = cfn.createStack(CreateStackRequest.builder() | ||
| .stackName(stackName) | ||
| .disableRollback(true) // For ease in debugging of failed stacks. Maybe not appropriate for "production". | ||
| .disableRollback(true) //TODO undo this |
Contributor
There was a problem hiding this comment.
please remove this debugging data
PoeppingT
reviewed
Jul 27, 2022
resources/tenant-onboarding-fsx.yaml
Outdated
| OntapConfiguration: | ||
| JunctionPath: /vol1 | ||
| SecurityStyle: NTFS | ||
| SizeInMegabytes: '40' # Quoted to make cfn-lint happy |
Contributor
There was a problem hiding this comment.
Why not make this a Parameter with a default of '40'?
volume size a template parameter.
PoeppingT
approved these changes
Jul 27, 2022
Contributor
PoeppingT
left a comment
PoeppingT
left a comment
There was a problem hiding this comment.
LGTM, thanks for the changes.
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
resources
can pass it to the FSx file system resource
resolve it in CloudFormation for the storage virtual machine resource
and FSx ONTAP
storage virtual machine
Co-authored-by: netapp-vedantsethia Vedant.Sethia@netapp.com
Co-authored-by: netapp-dhruv-tyagi Dhruv.Tyagi@netapp.com
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license