diff --git a/fast/stages/01-resman/README.md b/fast/stages/01-resman/README.md index 77189731..f525193d 100644 --- a/fast/stages/01-resman/README.md +++ b/fast/stages/01-resman/README.md @@ -54,7 +54,7 @@ If you have set a valid value for `outputs_location` in the bootstrap stage (see ```bash # `outputs_location` is set to `~/fast-config` -ln -s ~/fast-config/providers/01-resman* ./ +ln -s ~/fast-config/providers/01-resman-providers.tf . ``` If you have not configured `outputs_location` in bootstrap, you can derive the providers file from that stage's outputs: @@ -76,13 +76,13 @@ There are two broad sets of variables you will need to fill in: To avoid the tedious job of filling in the first group of variable with values derived from other stages' outputs, the same mechanism used above for the provider configuration can be used to leverage pre-configured `.tfvars` files. -If you configured a valid path for `outputs_location` in the bootstrap stage, simply link the relevant `terraform-*.auto.tfvars.json` files from this stage's outputs folder. For this stage, you need the `.tfvars` file compiled manually for the bootstrap stage, and the one generated by it: +If you configured a valid path for `outputs_location` in the bootstrap stage, simply link the relevant `terraform-*.auto.tfvars.json` files from the outputs folder. For this stage, you need the `.tfvars` file compiled manually for the bootstrap stage, and the one generated by it: ```bash -# `outputs_location` is set to `~/config` -ln -s ../../config/tfvars/00*.json ./ +# `outputs_location` is set to `~/fast-config` +ln -s ~/fast-config/tfvars/00-bootstrap.auto.tfvars.json . # also copy the tfvars file used for the bootstrap stage -cp ../00-bootstrap/terraform.tfvars ./ +cp ../00-bootstrap/terraform.tfvars . ``` A second set of variables is specific to this stage, they are all optional so if you need to customize them, create an extra `terraform.tfvars` file or add them to the file copied from bootstrap. diff --git a/fast/stages/02-networking-nva/README.md b/fast/stages/02-networking-nva/README.md index 9038c2be..a563da3a 100644 --- a/fast/stages/02-networking-nva/README.md +++ b/fast/stages/02-networking-nva/README.md @@ -200,14 +200,14 @@ To simplify the setup, the previous stage pre-configures a valid providers file If you have set a valid value for `outputs_location` in the bootstrap stage, simply link the relevant `providers.tf` file from this stage folder in the path you selected: ```bash -# `outputs_location` is set to `../../configs/example` -ln -s ../../configs/example/02-networking/providers.tf +# `outputs_location` is set to `~/fast-config` +ln -s ~/fast-config/providers/02-networking-providers.tf . ``` If you have not configured `outputs_location` in bootstrap, you can derive the providers file from that stage outputs: ```bash -cd ../00-bootstrap +cd ../01-resman terraform output -json providers | jq -r '.["02-networking"]' \ > ../02-networking-nva/providers.tf ``` @@ -224,12 +224,14 @@ To avoid the tedious job of filling in the first group of variables with values If you have set a valid value for `outputs_location` in the bootstrap and in the resman stage, simply link the relevant `terraform-*.auto.tfvars.json` files from this stage's folder in the path you specified, where the `*` above is set to the name of the stage that produced it. For this stage, a single `.tfvars` file is available: ```bash -# `outputs_location` is set to `../../configs/example` +# `outputs_location` is set to `~/fast-config` ln -s ../../configs/example/02-networking/terraform-bootstrap.auto.tfvars.json ln -s ../../configs/example/02-networking/terraform-resman.auto.tfvars.json +# also copy the tfvars file used for the bootstrap stage +cp ../00-bootstrap/terraform.tfvars . ``` -If you want to continue to rely on `outputs_location` logic, create a `terraform.tfvars` file and configure it as described [here](../00-bootstrap/#output-files-and-cross-stage-variables). +A second set of variables is specific to this stage, they are all optional so if you need to customize them, add them to the file copied from bootstrap. Please, refer to the [variables](#variables) table below for a map of the variable origins, and use the sections below to understand how to adapt this stage to your networking configuration. diff --git a/fast/stages/02-networking-vpn/README.md b/fast/stages/02-networking-vpn/README.md index b57f6b2d..5a96bf13 100644 --- a/fast/stages/02-networking-vpn/README.md +++ b/fast/stages/02-networking-vpn/README.md @@ -136,14 +136,14 @@ To simplify setup, the previous stage pre-configures a valid providers file in i If you have set a valid value for `outputs_location` in the bootstrap stage, simply link the relevant `providers.tf` file from this stage's folder in the path you specified: ```bash -# `outputs_location` is set to `../../config` -ln -s ../../config/02-networking/providers.tf +# `outputs_location` is set to `~/fast-config` +ln -s ~/fast-config/providers/02-networking-providers.tf . ``` If you have not configured `outputs_location` in bootstrap, you can derive the providers file from that stage's outputs: ```bash -cd ../00-bootstrap +cd ../01-resman terraform output -json providers | jq -r '.["02-networking"]' \ > ../02-networking/providers.tf ``` @@ -160,12 +160,14 @@ To avoid the tedious job of filling in the first group of variables with values If you have set a valid value for `outputs_location` in the bootstrap and in the resman stage, simply link the relevant `terraform-*.auto.tfvars.json` files from this stage's folder in the path you specified, where the `*` above is set to the name of the stage that produced it. For this stage, a single `.tfvars` file is available: ```bash -# `outputs_location` is set to `../../config` -ln -s ../../config/02-networking/terraform-bootstrap.auto.tfvars.json -ln -s ../../config/02-networking/terraform-resman.auto.tfvars.json +# `outputs_location` is set to `~/fast-config` +ln -s ../../configs/example/02-networking/terraform-bootstrap.auto.tfvars.json +ln -s ../../configs/example/02-networking/terraform-resman.auto.tfvars.json +# also copy the tfvars file used for the bootstrap stage +cp ../00-bootstrap/terraform.tfvars . ``` -If you want to continue to rely on `outputs_location` logic, create a `terraform.tfvars` file and configure it as deacribed [here](../00-bootstrap/#output-files-and-cross-stage-variables). +A second set of variables is specific to this stage, they are all optional so if you need to customize them, add them to the file copied from bootstrap. Please refer to the [Variables](#variables) table below for a map of the variable origins, and to the sections below on how to adapt this stage to your networking configuration.