Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
feat(terraform): 1n_aws_c5n
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
terraform.sh
diff --git
a/resources/libraries/bash/function/terraform.sh
b/resources/libraries/bash/function/terraform.sh
index
c076f52
..
1766381
100644
(file)
--- a/
resources/libraries/bash/function/terraform.sh
+++ b/
resources/libraries/bash/function/terraform.sh
@@
-32,9
+32,12
@@
function terraform_apply () {
fi
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
fi
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
- pushd "
${NODENESS}_${FLAVOR}_
c5n" || die "Pushd failed!"
+ pushd "
terraform-aws-${NODENESS}-${FLAVOR}-
c5n" || die "Pushd failed!"
export TF_LOG=INFO
export TF_LOG=INFO
- terraform apply -auto-approve || die "Failed to run terraform apply!"
+ trap 'terraform_destroy' ERR || {
+ die "Trap attempt failed, please cleanup manually. Aborting!"
+ }
+ terraform apply -no-color -auto-approve || die "Terraform apply failed!"
popd || die "Popd failed!"
popd || die "Popd failed!"
}
popd || die "Popd failed!"
popd || die "Popd failed!"
}
@@
-55,9
+58,9
@@
function terraform_destroy () {
fi
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
fi
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
- pushd "
${NODENESS}_${FLAVOR}_
c5n" || die "Pushd failed!"
+ pushd "
terraform-aws-${NODENESS}-${FLAVOR}-
c5n" || die "Pushd failed!"
export TF_LOG=INFO
export TF_LOG=INFO
- terraform destroy -auto-approve
|| die "Failed to run terraform destroy
!"
+ terraform destroy -auto-approve
-no-color || die "Terraform destroy failed
!"
popd || die "Popd failed!"
popd || die "Popd failed!"
}
popd || die "Popd failed!"
popd || die "Popd failed!"
}
@@
-85,7
+88,7
@@
function terraform_init () {
fi
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
fi
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
- pushd "
${NODENESS}_${FLAVOR}_
c5n" || die "Pushd failed!"
+ pushd "
terraform-aws-${NODENESS}-${FLAVOR}-
c5n" || die "Pushd failed!"
plugin_url="https://github.com/radekg/terraform-provisioner-ansible/"
plugin_url+="releases/download/v2.5.0/"
plugin_url="https://github.com/radekg/terraform-provisioner-ansible/"
plugin_url+="releases/download/v2.5.0/"