Added all TFE state files
This commit is contained in:
Chris Riley
Seth Vargo
parent
cf95a60639
commit
d7bea2aab4
|
|
@ -1,17 +1,21 @@
|
|||
---
|
||||
title: "Collaborating on Terraform Remote State in Atlas"
|
||||
layout: "state"
|
||||
page_title: "State: Collaborating"
|
||||
sidebar_current: "docs-enterprise-state-collaborating"
|
||||
description: |-
|
||||
How to collaborate on states.
|
||||
---
|
||||
|
||||
# Collaborating on Terraform Remote State in Atlas
|
||||
# Collaborating on Terraform Remote State
|
||||
|
||||
Atlas is one of a few options to store [remote state](/help/terraform/state).
|
||||
Atlas is one of a few options to store [remote state](/docs/enterprise/state).
|
||||
|
||||
Remote state gives you the ability to version and collaborate on Terraform changes. It
|
||||
stores information about the changes Terraform makes based on configuration.
|
||||
|
||||
In order to collaborate safely on remote state, we recommend
|
||||
[creating an organization](/help/organizations/create) to manage teams of users.
|
||||
[creating an organization](https://atlas.hashicorp.com/help/organizations/create) to manage teams of users.
|
||||
|
||||
Then, following a [remote state push](/help/terraform/state) you can view state versions
|
||||
in the changes tab of the [environment](/help/glossary#environment) created under the same name
|
||||
as the remote state.
|
||||
Then, following a [remote state push](/docs/enterprise/state) you can view state versions
|
||||
in the changes tab of the environment created under the same name
|
||||
as the remote state.
|
||||
|
|
@ -1,5 +1,9 @@
|
|||
---
|
||||
title: "About Remote State"
|
||||
layout: "state"
|
||||
page_title: "About Remote State"
|
||||
sidebar_current: "docs-enterprise-state"
|
||||
description: |-
|
||||
Terraform stores the state of your managed infrastructure from the last time Terraform was run. This section is about states.
|
||||
---
|
||||
|
||||
# About Remote State
|
||||
|
|
@ -9,7 +13,7 @@ time Terraform was run. By default this state is stored in a local file
|
|||
named `terraform.tfstate`, but it can also be stored remotely, which
|
||||
works better in a team environment.
|
||||
|
||||
Atlas is a remote state provider, allowing you to store, version and
|
||||
Terraform Enterprise is a remote state provider, allowing you to store, version and
|
||||
collaborate on state with Atlas.
|
||||
|
||||
Remote state gives you more than just easier version control and safer
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
---
|
||||
title: "Pushing Terraform Remote State to Atlas"
|
||||
layout: "state"
|
||||
page_title: "State: Pushing"
|
||||
sidebar_current: "docs-enterprise-state-pushing"
|
||||
description: |-
|
||||
Pushing remote states.
|
||||
---
|
||||
|
||||
# Pushing Terraform Remote State to Atlas
|
||||
# Pushing Terraform Remote State to Terraform Enterprise
|
||||
|
||||
Atlas is one of a few options to store [remote state](/help/terraform/state).
|
||||
Terraform Enterprise is one of a few options to store [remote state](/docs/enterprise/state).
|
||||
|
||||
Remote state gives you the ability to version and collaborate on Terraform changes. It
|
||||
stores information about the changes Terraform makes based on configuration.
|
||||
|
||||
To use Atlas to store remote state, you'll first need to have the
|
||||
To use Terraform Enterprise to store remote state, you'll first need to have the
|
||||
`ATLAS_TOKEN` environment variable set and run the following command.
|
||||
|
||||
$ terraform remote config -backend-config="name=%{DEFAULT_USERNAME}/product"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
---
|
||||
title: "Resolving Conflicts in Atlas Remote State"
|
||||
layout: "state"
|
||||
page_title: "State: Resolving Conflicts"
|
||||
sidebar_current: "docs-enterprise-state-resolving"
|
||||
description: |-
|
||||
Resolving conflicts with remote states.
|
||||
---
|
||||
|
||||
# Resolving Conflicts in Atlas Remote State
|
||||
# Resolving Conflicts in Remote States
|
||||
|
||||
Resolving state conflicts can be time consuming and error prone, so
|
||||
it's important to approach it carefully.
|
||||
|
||||
There are several tools provided by Atlas to help resolve conflicts
|
||||
There are several tools provided by Terraform Enterprise to help resolve conflicts
|
||||
and fix remote state issues. First, you can navigate between state
|
||||
versions in the changes view of your environment (after toggling on
|
||||
the remote state checkbox) and view plain-text differences between
|
||||
|
|
@ -33,15 +37,15 @@ to perform the operation.
|
|||
|
||||
### Using Terraform Locally
|
||||
|
||||
Another way to resolve conflicts in Atlas remote state
|
||||
Another way to resolve remote state conflicts
|
||||
is to merge and conflicted copies locally by inspecting the
|
||||
raw state available in the path `.terraform/terraform.tfstate`.
|
||||
|
||||
When making state changes, it's important to make backup copies in
|
||||
order to avoid losing any data.
|
||||
|
||||
Atlas will reject any state that is pushed with a serial that is lower
|
||||
than the known serial when the MD5 of the state does not match.
|
||||
Any state that is pushed with a serial that is lower
|
||||
than the known serial when the MD5 of the state does not match will be rejected.
|
||||
|
||||
The serial is embedded in the state file:
|
||||
|
||||
|
|
@ -58,10 +62,10 @@ The serial is embedded in the state file:
|
|||
}
|
||||
|
||||
Once a conflict has been resolved locally by editing the state file,
|
||||
the serial can be incremented past the current version in Atlas and
|
||||
the serial can be incremented past the current version and
|
||||
pushed:
|
||||
|
||||
terraform remote push
|
||||
|
||||
This will upload the manually resolved state and set it as the head
|
||||
version in Atlas.
|
||||
version.
|
||||
|
|
|
|||
|
|
@ -336,6 +336,7 @@
|
|||
<a href="/docs/providers/azure/index.html">Microsoft Azure (Legacy ASM)</a>
|
||||
</li>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<li<%= sidebar_current("docs-providers-mysql") %>>
|
||||
<a href="/docs/providers/mysql/index.html">MySQL</a>
|
||||
</li>
|
||||
|
|
@ -560,4 +561,253 @@
|
|||
<% end %>
|
||||
|
||||
<%= yield %>
|
||||
=======
|
||||
<li<%= sidebar_current("docs-providers-nomad") %>>
|
||||
<a href="/docs/providers/nomad/index.html">Nomad</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-ns1") %>>
|
||||
<a href="/docs/providers/ns1/index.html">NS1</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-azurerm") %>>
|
||||
<a href="/docs/providers/azurerm/index.html">Microsoft Azure</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-azurerm") %>>
|
||||
<a href="/docs/providers/azure/index.html">Microsoft Azure (Legacy ASM)</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-mysql") %>>
|
||||
<a href="/docs/providers/mysql/index.html">MySQL</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-openstack") %>>
|
||||
<a href="/docs/providers/openstack/index.html">OpenStack</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-opsgenie") %>>
|
||||
<a href="/docs/providers/opsgenie/index.html">OpsGenie</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-packet") %>>
|
||||
<a href="/docs/providers/packet/index.html">Packet</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-pagerduty") %>>
|
||||
<a href="/docs/providers/pagerduty/index.html">PagerDuty</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-postgresql") %>>
|
||||
<a href="/docs/providers/postgresql/index.html">PostgreSQL</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-powerdns") %>>
|
||||
<a href="/docs/providers/powerdns/index.html">PowerDNS</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-profitbricks") %>>
|
||||
<a href="/docs/providers/profitbricks/index.html">ProfitBricks</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-rabbitmq") %>>
|
||||
<a href="/docs/providers/rabbitmq/index.html">RabbitMQ</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-rancher") %>>
|
||||
<a href="/docs/providers/rancher/index.html">Rancher</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-random") %>>
|
||||
<a href="/docs/providers/random/index.html">Random</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-rundeck") %>>
|
||||
<a href="/docs/providers/rundeck/index.html">Rundeck</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-scaleway") %>>
|
||||
<a href="/docs/providers/scaleway/index.html">Scaleway</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-softlayer") %>>
|
||||
<a href="/docs/providers/softlayer/index.html">SoftLayer</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-statuscake") %>>
|
||||
<a href="/docs/providers/statuscake/index.html">StatusCake</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-spotinst") %>>
|
||||
<a href="/docs/providers/spotinst/index.html">Spotinst</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-template") %>>
|
||||
<a href="/docs/providers/template/index.html">Template</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-terraform") %>>
|
||||
<a href="/docs/providers/terraform/index.html">Terraform</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-tls") %>>
|
||||
<a href="/docs/providers/tls/index.html">TLS</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-triton") %>>
|
||||
<a href="/docs/providers/triton/index.html">Triton</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-ultradns") %>>
|
||||
<a href="/docs/providers/ultradns/index.html">UltraDNS</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-vault") %>>
|
||||
<a href="/docs/providers/vault/index.html">Vault</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-vcd") %>>
|
||||
<a href="/docs/providers/vcd/index.html">VMware vCloud Director</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-providers-vsphere") %>>
|
||||
<a href="/docs/providers/vsphere/index.html">VMware vSphere</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current(/^docs-provisioners/) %>>
|
||||
<a href="/docs/provisioners/index.html">Provisioners</a>
|
||||
<ul class="nav">
|
||||
<li<%= sidebar_current("docs-provisioners-chef") %>>
|
||||
<a href="/docs/provisioners/chef.html">chef</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-provisioners-connection") %>>
|
||||
<a href="/docs/provisioners/connection.html">connection</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-provisioners-file") %>>
|
||||
<a href="/docs/provisioners/file.html">file</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-provisioners-local") %>>
|
||||
<a href="/docs/provisioners/local-exec.html">local-exec</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-provisioners-remote") %>>
|
||||
<a href="/docs/provisioners/remote-exec.html">remote-exec</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-provisioners-null-resource") %>>
|
||||
<a href="/docs/provisioners/null_resource.html">null_resource</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current(/^docs-modules/) %>>
|
||||
<a href="/docs/modules/index.html">Modules</a>
|
||||
<ul class="nav">
|
||||
<li<%= sidebar_current("docs-modules-usage") %>>
|
||||
<a href="/docs/modules/usage.html">Usage</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-modules-sources") %>>
|
||||
<a href="/docs/modules/sources.html">Sources</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-modules-create") %>>
|
||||
<a href="/docs/modules/create.html">Creating Modules</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current(/^docs-backends/) %>>
|
||||
<a href="/docs/backends/index.html">Backends</a>
|
||||
<ul class="nav">
|
||||
<li<%= sidebar_current("docs-backends-init") %>>
|
||||
<a href="/docs/backends/init.html">Init</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-backends-config") %>>
|
||||
<a href="/docs/backends/config.html">Configuration</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-backends-state") %>>
|
||||
<a href="/docs/backends/state.html">State Storage & Locking</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-backends-types") %>>
|
||||
<a href="/docs/backends/types/index.html">Backend Types</a>
|
||||
</li>
|
||||
|
||||
<!--
|
||||
<li<%= sidebar_current("docs-backends-ops") %>>
|
||||
<a href="/docs/backends/operations.html">Operations</a>
|
||||
</li>
|
||||
-->
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current(/^docs-plugins/) %>>
|
||||
<a href="/docs/plugins/index.html">Plugins</a>
|
||||
<ul class="nav">
|
||||
<li<%= sidebar_current("docs-plugins-basics") %>>
|
||||
<a href="/docs/plugins/basics.html">Basics</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-plugins-provider") %>>
|
||||
<a href="/docs/plugins/provider.html">Provider</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-internals-plugins") %>>
|
||||
<a href="/docs/internals/internal-plugins.html">Internals</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current(/^docs-internals/) %>>
|
||||
<a href="/docs/internals/index.html">Internals</a>
|
||||
<ul class="nav">
|
||||
<li<%= sidebar_current("docs-internals-debug") %>>
|
||||
<a href="/docs/internals/debugging.html">Debugging Terraform</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-internals-graph") %>>
|
||||
<a href="/docs/internals/graph.html">Resource Graph</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-internals-lifecycle") %>>
|
||||
<a href="/docs/internals/lifecycle.html">Resource Lifecycle</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-internals-resource-addressing") %>>
|
||||
<a href="/docs/internals/resource-addressing.html">Resource Addressing</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-internals-plugins") %>>
|
||||
<a href="/docs/internals/internal-plugins.html">Internal Plugins</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current(/^docs-enterprise/) %>>
|
||||
<a href="/docs/enterprise/index.html">Terraform Enterprise</a>
|
||||
<ul class="nav">
|
||||
<li<%= sidebar_current("docs-enterprise-runs") %>>
|
||||
<a href="/docs/enterprise/runs/index.html">Runs</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-state") %>>
|
||||
<a href="/docs/enterprise/state/index.html">State</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= yield %>
|
||||
>>>>>>> 568c35750... Added all TFE state files
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
<% wrap_layout :inner do %>
|
||||
<% content_for :sidebar do %>
|
||||
<div class="docs-sidebar hidden-print affix-top" role="complementary">
|
||||
<ul class="nav docs-sidenav">
|
||||
<li>
|
||||
<a href="/docs/enterprise/index.html">« Terraform Enterprise</a>
|
||||
</li>
|
||||
|
||||
<li<%= sidebar_current(/^docs-enterprise-state-/) %>>
|
||||
<a href="/docs/enterprise/state/index.html">State</a>
|
||||
<ul class="nav nav-visible">
|
||||
<li<%= sidebar_current("docs-enterprise-state-pushing") %>>
|
||||
<a href="/docs/enterprise/state/pushing.html">Pushing State</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-state-resolving") %>>
|
||||
<a href="/docs/enterprise/state/resolving-conflicts.html">Resolving Conflicts</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-state-collaborating") %>>
|
||||
<a href="/docs/enterprise/state/collaborating.html">Collaborating</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= yield %>
|
||||
<% end %>
|
||||
Loading…
Reference in New Issue