Commit 1c19cc92 authored by Viktor Nagy's avatar Viktor Nagy Committed by Amy Qualls

Revisions for tone and style

Add changes to bring the page closer to GitLab tone and style.

Also hard wraps on lines.
parent c6c3dc03
...@@ -8,11 +8,37 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -8,11 +8,37 @@ info: To determine the technical writer assigned to the Stage/Group associated w
## Motivation ## Motivation
The Terraform integration features within GitLab enable your GitOps / Infrastructure-as-Code (IaC) The Terraform integration features in GitLab enable your GitOps / Infrastructure-as-Code (IaC)
workflows to tie into GitLab authentication and authorization. These features focus on workflows to tie into GitLab authentication and authorization. These features focus on
lowering the barrier to entry for teams to adopt Terraform, collaborate effectively within lowering the barrier to entry for teams to adopt Terraform, collaborate effectively in
GitLab, and support Terraform best practices. GitLab, and support Terraform best practices.
## Quick Start
Use the following `.gitlab-ci.yml` to set up a basic Terraform project integration
for GitLab versions 13.5 and later:
```yaml
include:
- template: Terraform.latest.gitlab-ci.yml
variables:
# If not using GitLab's HTTP backend, remove this line and specify TF_HTTP_* variables
TF_STATE_NAME: default
TF_CACHE_KEY: default
```
This template uses `.latest.`, instead of stable, and may include breaking changes.
This template also includes some opinionated decisions, which you can override:
- Including the latest [GitLab Terraform Image](https://gitlab.com/gitlab-org/terraform-images).
- Using the [GitLab managed Terraform State](#gitlab-managed-terraform-state) as
the Terraform state storage backend.
- Creating [four pipeline stages](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform.latest.gitlab-ci.yml):
`init`, `validate`, `build`, and `deploy`. These stages
[run the Terraform commands](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml)
`init`, `validate`, `plan`, `plan-json`, and `apply`. The `apply` command only runs on `master`.
## GitLab Managed Terraform state ## GitLab Managed Terraform state
[Terraform remote backends](https://www.terraform.io/docs/backends/index.html) [Terraform remote backends](https://www.terraform.io/docs/backends/index.html)
...@@ -22,7 +48,7 @@ to securely store the state files in local storage (the default) or ...@@ -22,7 +48,7 @@ to securely store the state files in local storage (the default) or
[the remote store of your choice](../../administration/terraform_state.md). [the remote store of your choice](../../administration/terraform_state.md).
The GitLab managed Terraform state backend can store your Terraform state easily and The GitLab managed Terraform state backend can store your Terraform state easily and
securely, and spares you from setting up additional remote resources like securely. It spares you from setting up additional remote resources like
Amazon S3 or Google Cloud Storage. Its features include: Amazon S3 or Google Cloud Storage. Its features include:
- Supporting encryption of the state file both in transit and at rest. - Supporting encryption of the state file both in transit and at rest.
...@@ -39,32 +65,23 @@ recommends encrypting plan output or modifying the project visibility settings. ...@@ -39,32 +65,23 @@ recommends encrypting plan output or modifying the project visibility settings.
## Terraform integration in Merge Requests ## Terraform integration in Merge Requests
Collaborating around Infrastructure as Code (IaC) changes requires both code changes and expected infrastructure changes to be checked and approved. GitLab provides a solution to help collaboration around Terraform code changes and their expected effects using the Merge Request pages. This way users don't have to build custom tools or rely on 3rd party solutions to streamline their IaC workflows. Collaborating around Infrastructure as Code (IaC) changes requires both code changes
and expected infrastructure changes to be checked and approved. GitLab provides a
solution to help collaboration around Terraform code changes and their expected
effects using the Merge Request pages. This way users don't have to build custom
tools or rely on 3rd party solutions to streamline their IaC workflows.
Read more on setting up and [using the merge request integrations](mr_integration.md). Read more on setting up and [using the merge request integrations](mr_integration.md).
## Quick Start ## The GitLab terraform provider
Use the following `.gitlab-ci.yml` to set up a simple Terraform project integration
for GitLab versions 13.5 and greater:
```yaml WARNING:
include: The GitLab Terraform provider is released separately from GitLab.
- template: Terraform.latest.gitlab-ci.yml We are working on migrating the GitLab Terraform provider for GitLab.com.
variables:
# If not using GitLab's HTTP backend, remove this line and specify TF_HTTP_* variables
TF_STATE_NAME: default
TF_CACHE_KEY: default
```
This template uses `.latest.`, instead of stable, and may include breaking changes. You can use the [GitLab Terraform provider](https://github.com/gitlabhq/terraform-provider-gitlab)
This template also includes some opinionated decisions, which you can override: to manage various aspects of GitLab using Terraform. The provider is an open source project,
owned by GitLab, where everyone can contribute.
- Including the latest [GitLab Terraform Image](https://gitlab.com/gitlab-org/terraform-images). The [documentation of the provider](https://registry.terraform.io/providers/gitlabhq/gitlab/latest/docs)
- Using the [GitLab managed Terraform State](#gitlab-managed-terraform-state) as is available as part of the official Terraform provider documentations.
the Terraform state storage backend.
- Creating [four pipeline stages](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform.latest.gitlab-ci.yml):
`init`, `validate`, `build`, and `deploy`. These stages
[run the Terraform commands](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Terraform/Base.latest.gitlab-ci.yml)
`init`, `validate`, `plan`, `plan-json`, and `apply`. The `apply` command only runs on `master`.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment