Skip to content

DAOSGCP-163 IO500 example refactoring#78

Merged
mark-olson merged 13 commits intodaos-stack:developfrom
mark-olson:DAOSGCP-163
May 3, 2023
Merged

DAOSGCP-163 IO500 example refactoring#78
mark-olson merged 13 commits intodaos-stack:developfrom
mark-olson:DAOSGCP-163

Conversation

@mark-olson
Copy link
Copy Markdown
Contributor

Refactored terraform/examples/io500

Changes starting with '[ML]' were either contributed directly or suggested by Margaret Lawson.

  • Wrapper scripts moved to bin/ directory
  • Client scripts moved to client_scripts/ directory
  • Scripts in images/ directory updated to wrap new images/build.sh script
  • Do not use terraform/examples/daos_cluster for io500 example. terraform/examples/io500 has its own terraform configuration now.
  • Removed the use of TF_VARS_* environment variables. Now uses a terraform.tfvars file that is generated based on the config/*.sh file that is used by the start.sh script.
  • [ML] SERVER_OS_FAMILY and CLIENT_OS_FAMILY adjusted to include the word "DAOS"
  • [ML] Do not use preemptible instances for IO500

Signed-off-by: Margaret Lawson mlawsonca@google.com

Signed-off-by: Mark Olson 115657904+mark-olson@users.noreply.github.com

Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Switch from CentOS 7 to Rocky 8

Use Ansible playbooks instead of bash scripts to configure tunings
and install software.

Refactor and simplify files in the images/ directory.

Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
- Move all bash scripts for deploy/destroy to terraform/examples/io500/bin
- Move all files that need to be copied to the first client instance to terraform/examples/io500/client_files
- Do not use the 'terraform/examples/daos_cluster' directory for the 'terraform/examples/io500' example
- Rename terraform/examples/io500/config/*.sh files.
- [mlawsonca] Move TF_VARS_* variables out of config/*.sh files
- [mlawsonca] SERVER_OS_FAMILY and CLIENT_OS_FAMILY vars renamed to start with "DAOS" since other vars start with "DAOS"

Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
Comment thread terraform/examples/io500/README.md Outdated
| <a name="input_server_daos_disk_count"></a> [server\_daos\_disk\_count](#input\_server\_daos\_disk\_count) | Number of local ssd's to use | `number` | `16` | no |
| <a name="input_server_daos_scm_size"></a> [server\_daos\_scm\_size](#input\_server\_daos\_scm\_size) | scm\_size | `number` | `200` | no |
| <a name="input_server_gvnic"></a> [server\_gvnic](#input\_server\_gvnic) | Use Google Virtual NIC (gVNIC) network interface | `bool` | `false` | no |
| <a name="input_server_instance_base_name"></a> [server\_instance\_base\_name](#input\_server\_instance\_base\_name) | MIG instance base names to use | `string` | `"daos-server"` | no |
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this say MIG?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed any text that refers to "MIG"

Comment thread terraform/examples/io500/variables.tf Outdated
Copy link
Copy Markdown
Collaborator

@mlawsonca mlawsonca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like you mentioned it is a fairly large PR but on first glance it looks good. My only comment is about the references to MIGs found throughout the code.

ravalsam
ravalsam previously approved these changes May 1, 2023
Copy link
Copy Markdown

@ravalsam ravalsam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified all the test cases described, and all worked fine.

Removed references to MIGs in README files and variables.tf files.

Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
@mark-olson mark-olson merged commit 77db0be into daos-stack:develop May 3, 2023
mark-olson added a commit that referenced this pull request May 18, 2023
Refactored terraform/examples/io500

Changes starting with '[ML]' were either contributed directly or suggested by Margaret Lawson.

- Wrapper scripts moved to bin/ directory
- Client scripts moved to client_scripts/ directory
- Scripts in images/ directory updated to wrap new images/build.sh script
- Do not use terraform/examples/daos_cluster for io500 example. terraform/examples/io500 has its own terraform configuration now.
- Removed the use of TF_VARS_* environment variables. Now uses a terraform.tfvars file that is generated based on the config/*.sh file that is used by the start.sh script.
- Set default log level to INFO
- Removed references to MIGs
- [ML] Restart clients after clean
- [ML] SERVER_OS_FAMILY and CLIENT_OS_FAMILY adjusted to include the word "DAOS"
- [ML] Do not use preemptible instances for IO500

Signed-off-by: Mark Olson <115657904+mark-olson@users.noreply.github.com>
@mark-olson mark-olson deleted the DAOSGCP-163 branch May 23, 2023 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants