Update VCS
This commit is contained in:
parent
e5f60930c0
commit
fa4d6ec5f8
|
@ -1,28 +1,27 @@
|
||||||
---
|
---
|
||||||
layout: "vcs"
|
layout: "enterprise"
|
||||||
page_title: "Git Integration"
|
page_title: "Git - VCS Integrations - Terraform Enterprise"
|
||||||
sidebar_current: "docs-enterprise-vcs-git"
|
sidebar_current: "docs-enterprise-vcs-git-"
|
||||||
description: |-
|
description: |-
|
||||||
Git repositories can be integrated with Terraform Enterprise by using push command.
|
Git repositories can be integrated with Terraform Enterprise by using push command.
|
||||||
---
|
---
|
||||||
|
|
||||||
# Git Integation
|
# Git Integration
|
||||||
|
|
||||||
Git repositories can be integrated with Terraform Enterprise by using
|
Git repositories can be integrated with Terraform Enterprise by using
|
||||||
[`terraform push`](https://www.terraform.io/docs/commands/push.html) to import
|
[`terraform push`](/docs/commands/push.html) to import Terraform configuration
|
||||||
Terraform configuration when changes are committed. When Terraform
|
when changes are committed. When Terraform configuration is imported using
|
||||||
configuration is imported using `terraform push` a plan is automatically queued.
|
`terraform push` a plan is automatically queued.
|
||||||
|
|
||||||
_**Note:** This integration is for Git repositories **not** hosted on GitHub.
|
-> This integration is for Git repositories **not** hosted on GitHub. For GitHub, please see the GitHub documentation instead.
|
||||||
For repositories on GitHub, there is native [GitHub Integration](/docs/enterprise/vcs/github.html).
|
|
||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
Terraform configuration can be manually imported by running `terraform push`
|
Terraform configuration can be manually imported by running `terraform push`
|
||||||
like below:
|
like below:
|
||||||
|
|
||||||
```
|
```shell
|
||||||
$ terraform push -name=$ATLAS_USERNAME/ENV_NAME
|
$ terraform push -name=$USERNAME/ENV_NAME
|
||||||
```
|
```
|
||||||
|
|
||||||
A better option than having to manually run `terraform push` is to run it
|
A better option than having to manually run `terraform push` is to run it
|
||||||
|
@ -36,7 +35,7 @@ The script below will execute `terraform push` when you push local changes to
|
||||||
your Git server. Place the script at `.git/pre-push` in your local Git
|
your Git server. Place the script at `.git/pre-push` in your local Git
|
||||||
repository, set the necessary variables, and ensure the script is executable.
|
repository, set the necessary variables, and ensure the script is executable.
|
||||||
|
|
||||||
```
|
```shell
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# An example hook script to push Terraform configuration to Terraform Enterprise.
|
# An example hook script to push Terraform configuration to Terraform Enterprise.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
layout: "vcs"
|
layout: "enterprise"
|
||||||
page_title: "GitHub Integration"
|
page_title: "GitHub - VCS Integrations - Terraform Enterprise"
|
||||||
sidebar_current: "docs-enterprise-vcs-github"
|
sidebar_current: "docs-enterprise-vcs-github"
|
||||||
description: |-
|
description: |-
|
||||||
GitHub repositories can be integrated with Terraform Enterprise by using push command.
|
GitHub repositories can be integrated with Terraform Enterprise by using push command.
|
||||||
|
@ -8,28 +8,31 @@ description: |-
|
||||||
|
|
||||||
# GitHub Integration
|
# GitHub Integration
|
||||||
|
|
||||||
GitHub can be used to import Terraform configuration, automatically queuing
|
GitHub can be used to import Terraform configuration, automatically queuing runs
|
||||||
runs when changes are merged into a repository's default branch. Additionally,
|
when changes are merged into a repository's default branch. Additionally, plans
|
||||||
plans are run when a pull request is created or updated. Terraform Enterprise will update the
|
are run when a pull request is created or updated. Terraform Enterprise will
|
||||||
pull request with the result of the Terraform plan providing quick feedback on
|
update the pull request with the result of the Terraform plan providing quick
|
||||||
proposed changes.
|
feedback on proposed changes.
|
||||||
|
|
||||||
## Setup
|
## Setup
|
||||||
|
|
||||||
Terraform Enterprise environments are linked to individual GitHub repositories. However, a
|
Terraform Enterprise environments are linked to individual GitHub repositories.
|
||||||
single GitHub repository can be linked to multiple environments allowing
|
However, a single GitHub repository can be linked to multiple environments
|
||||||
a single set of Terraform configuration to be used across multiple environments.
|
allowing a single set of Terraform configuration to be used across multiple
|
||||||
|
environments.
|
||||||
|
|
||||||
Environments can be linked when they're initially created using the New Environment process.
|
Environments can be linked when they're initially created using the New
|
||||||
Existing environments can be linked by setting GitHub details in their
|
Environment process. Existing environments can be linked by setting GitHub
|
||||||
**Integrations**.
|
details in their **Integrations**.
|
||||||
|
|
||||||
To link a Terraform Enterprise environment to a GitHub repository, you need three pieces of
|
To link a Terraform Enterprise environment to a GitHub repository, you need
|
||||||
information:
|
three pieces of information:
|
||||||
|
|
||||||
- **GitHub repository** - The location of the repository being imported in the
|
- **GitHub repository** - The location of the repository being imported in the
|
||||||
format _username/repository_.
|
format _username/repository_.
|
||||||
|
|
||||||
- **GitHub branch** - The branch from which to ingress new versions. This
|
- **GitHub branch** - The branch from which to ingress new versions. This
|
||||||
defaults to the value GitHub provides as the default branch for this repository.
|
defaults to the value GitHub provides as the default branch for this repository.
|
||||||
|
|
||||||
- **Path to directory of Terraform files** - The repository's subdirectory that
|
- **Path to directory of Terraform files** - The repository's subdirectory that
|
||||||
contains its terraform files. This defaults to the root of the repository.
|
contains its terraform files. This defaults to the root of the repository.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
layout: "enterprise"
|
layout: "enterprise"
|
||||||
page_title: "Integration with Version Control Software"
|
page_title: "VCS Integrations - Terraform Enterprise"
|
||||||
sidebar_current: "docs-enterprise-vcs"
|
sidebar_current: "docs-enterprise-vcs"
|
||||||
description: |-
|
description: |-
|
||||||
Terraform Enterprise can integrate with version control software Git and GitHub.
|
Terraform Enterprise can integrate with version control software Git and GitHub.
|
||||||
|
@ -8,12 +8,10 @@ description: |-
|
||||||
|
|
||||||
# Integration with Version Control Software
|
# Integration with Version Control Software
|
||||||
|
|
||||||
Terraform Enterprise can integrate with your version control software to automatically execute
|
Terraform Enterprise can integrate with your version control software to
|
||||||
Terraform with your latest Terraform configuration as you commit changes to
|
automatically execute Terraform with your latest Terraform configuration as you
|
||||||
source control.
|
commit changes to source control.
|
||||||
|
|
||||||
Different capabilities within Terraform Enterprise are available depending on the integration
|
Different capabilities within Terraform Enterprise are available depending on
|
||||||
in use. The available integration options are below.
|
the integration in use. The available integration options are on the sidebar
|
||||||
|
navigation.
|
||||||
- [Git](/docs/enterprise/vcs/git.html)
|
|
||||||
- [GitHub](/docs/enterprise/vcs/github.html)
|
|
||||||
|
|
Loading…
Reference in New Issue