From ed72f828240f6184b38c38f8ccd078308c9cdfb9 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 31 Jan 2022 12:25:21 +0100 Subject: feat(docs): Static content update Signed-off-by: Peter Mikus Change-Id: I1cdd628be1d358fcca4bf05c9357c195ee3a8288 --- .../introduction/methodology_aws/aws_ami.rst | 8 +-- .../introduction/methodology_aws/aws_terraform.rst | 63 +--------------------- 2 files changed, 2 insertions(+), 69 deletions(-) (limited to 'docs/report/introduction/methodology_aws') diff --git a/docs/report/introduction/methodology_aws/aws_ami.rst b/docs/report/introduction/methodology_aws/aws_ami.rst index 264da01a1f..d772976b09 100644 --- a/docs/report/introduction/methodology_aws/aws_ami.rst +++ b/docs/report/introduction/methodology_aws/aws_ami.rst @@ -37,13 +37,7 @@ details examples: - Root Device Type: ebs Both TG and SUT AMIs are created manually before launching topology and are not -part of automated scripts. To create CSIT AMIs: - -:: - - cd csit/fdio.infra.packer/aws_c5n/ - packer init - packer build +part of automated scripts. Building AMIs requires Hashicorp Packer with Amazon plugin installed. diff --git a/docs/report/introduction/methodology_aws/aws_terraform.rst b/docs/report/introduction/methodology_aws/aws_terraform.rst index ebbef9000a..4b063d5ee4 100644 --- a/docs/report/introduction/methodology_aws/aws_terraform.rst +++ b/docs/report/introduction/methodology_aws/aws_terraform.rst @@ -34,71 +34,10 @@ Requirements - `Vault `_ service available on specified ip/port. -Usage -~~~~~ - -- OPTIONAL: Enable logging - - - Terraform does not have logging enabled by default, to enable logging - to stderr, set up TF_LOG variable with specified loglevel. - - Available loglevels: TRACE, DEBUG, INFO, WARN, ERROR: - - :: - - export TF_LOG="LOGLEVEL" - - - It is also possible to store logged output to a file by setting up - TF_LOG_PATH variable: - - :: - - export TF_LOG_PATH="path/to/logfile" - -- Run Terraform in a given root module folder depending on chosen testbed - topology. - - - Terraform will deploy and configure instances and other resources, - all of these resources can be later identified on AWS via - Environment tag. - - By default, Environment tag "CSIT-AWS" is used. Example: - - :: - - cd fdio.infra.terraform/2n_aws_c5n/ - terraform init - terraform plan - terraform apply - - - This will deploy environment with default values, you can check the - defaults in `./2n_aws_c5n/main.tf` and `./2n_aws_c5n/variables.tf` - files. - - If you would like to change some of these values, you can: - - - Set up TF_VAR_* environment variables prior to running 'terraform apply': - - :: - - export TF_VAR_testbed_name="testbed1" - - - Use '-var=varname=value' flag when running 'terraform apply': - - :: - - terraform apply -var=testbed_name=testbed1 - - - Note: Only variables defined in `variables.tf` file of the root - module can be changed using these methods. - -- To clean up the AWS environment and remove all used resources, run: - - :: - - terraform destroy - Deployment Example ~~~~~~~~~~~~~~~~~~ -Following is an example of a +Following is an example of a `Terraform deploy module `_ for a CSIT 2-Node testbed topology with AWS variables set to default values. A number of variables is also defined in a -- cgit 1.2.3-korg