Removed FTE "billing" doc and added FTE level of hierarchy
This commit is contained in:
Chris Riley
Seth Vargo
parent
dd76ccb579
commit
a71c5ebfee
|
|
@ -1,116 +0,0 @@
|
|||
---
|
||||
layout: "docs"
|
||||
page_title: "Billing: Managed Nodes"
|
||||
sidebar_current: "docs-enterprise"
|
||||
description: |-
|
||||
HashiCorp charges for usage based on **managed nodes**. The definition of managed node is specific to the enterprise product and is described below.
|
||||
---
|
||||
|
||||
# Managed Nodes
|
||||
|
||||
HashiCorp charges for usage based on **managed nodes**. The definition of
|
||||
managed node is specific to the enterprise product and is described below.
|
||||
|
||||
For all enterprise products, the count of managed nodes is observed and
|
||||
recorded every hour. At the end of the billing month a weighted average of
|
||||
this recorded value is calculated to determine the overall managed node count
|
||||
for billing.
|
||||
|
||||
## Terraform Enterprise
|
||||
|
||||
For Terraform Enterprise, a managed node is a compute resource defined in your
|
||||
Terraform configuration. For certain resource types the managed node count is
|
||||
determined by a property of the resource. The `count` meta-parameter is used
|
||||
for all compute resource types. The complete list of compute resources and
|
||||
resource arguments for determining managed node count is below.
|
||||
|
||||
<table class="apidocs">
|
||||
<tr>
|
||||
<th>Provider</th>
|
||||
<th>Resource Type</th>
|
||||
<th>Resource Property</th>
|
||||
</tr>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>AWS</td>
|
||||
<td>`aws_instance`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>AWS
|
||||
<td>`aws_autoscaling_group`</td>
|
||||
<td>`count` `desired_capacity`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Azure</td>
|
||||
<td>`azure_instance`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Azure</td>
|
||||
<td>`azurerm_virtual_machine`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>CenturyLink Cloud</td>
|
||||
<td>`clc_server`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>CloudStack</td>
|
||||
<td>`cloudstack_instance`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>DigitalOcean</td>
|
||||
<td>`digitalocean_droplet`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Google Cloud</td>
|
||||
<td>`google_compute_instance`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Google Cloud</td>
|
||||
<td>`compute_instance_group_manager`</td>
|
||||
<td>`count` `target_size`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Heroku</td>
|
||||
<td>`heroku_app`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>OpenStack</td>
|
||||
<td>`openstack_compute_instance_v2`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Packet</td>
|
||||
<td>`packet_device`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Triton</td>
|
||||
<td>`triton_machine`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>VMware vCloud Director</td>
|
||||
<td>`vcd_vapp`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>VMware vSphere provider</td>
|
||||
<td>`vsphere_virtual_machine`</td>
|
||||
<td>`count`</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
Terraform Enterprise includes unlimited Packer builds and artifact storage.
|
||||
|
||||
# Billing Support
|
||||
|
||||
For questions related to billing please email
|
||||
[support@hashicorp.com](mailto:support@hashicorp.com).
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
layout: "docs"
|
||||
layout: "enterprise"
|
||||
page_title: "Terraform Enterprise Glossary"
|
||||
sidebar_current: "docs-enterprise"
|
||||
description: |-
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
layout: "docs"
|
||||
layout: "enterprise"
|
||||
page_title: "Terraform Enterprise Features"
|
||||
sidebar_current: "docs-enterprise"
|
||||
description: |-
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
---
|
||||
title: " AWS Multi-Factor Authentication for Terraform Runs in Atlas"
|
||||
layout: "runs"
|
||||
page_title: "AWS Multi-Factor Authentication for Terraform Runs in TFE"
|
||||
sidebar_current: "docs-enterprise-runs-multifactor"
|
||||
description: |-
|
||||
Installing custom software on the Terraform Runners.
|
||||
---
|
||||
|
||||
# AWS Multi-Factor Authentication for Terraform Runs in Atlas
|
||||
# AWS Multi-Factor Authentication for Terraform Runs in Terraform Enterprise
|
||||
|
||||
You can optionally configure Terraform plans and applies to use multi-factor authentication using [AWS Secure Token Service](http://docs.aws.amazon.com/STS/latest/APIReference/Welcome.html).
|
||||
|
||||
|
|
@ -18,15 +22,14 @@ This option is disabled by default and can be enabled by an organization owner.
|
|||
|
||||
## Setting Up AWS Multi-Factor Authentication
|
||||
|
||||
Before you are able to set up multi-factor authentication in atlas, you must set up an IAM user in AWS. More details about creating an IAM user can be found [here](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa_enable.html). Setting up an AWS IAM user will provide you with the serial number and access keys that you will need in order to connect to AWS Secure Token Service.
|
||||
Before you are able to set up multi-factor authentication in Terraform Enterprise, you must set up an IAM user in AWS. More details about creating an IAM user can be found [here](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa_enable.html). Setting up an AWS IAM user will provide you with the serial number and access keys that you will need in order to connect to AWS Secure Token Service.
|
||||
|
||||
In order to set up multi-factor authentication for your organization, you must have the following environment variables in your configuration: 'AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_MFA_SERIAL_NUMBER". You can set these variables at `/settings/organization_variables.`
|
||||
|
||||
|
||||
## Enabling AWS Multi-Factor Authentication
|
||||
|
||||
To enable multi-factor authentication, visit the environment settings page in
|
||||
Atlas: `terraform/<organization>/environments/<environment>/settings`. Use the drop down labeled "AWS Multi-Factor Authentication
|
||||
To enable multi-factor authentication, visit the environment settings page: `terraform/<organization>/environments/<environment>/settings`. Use the drop down labeled "AWS Multi-Factor Authentication
|
||||
". There are currently three levels available: "never", "applies only", and "plans and applies". Once you have selected your desired level, save your settings. All subsequent runs on the environment will now require the selected level of authentication.
|
||||
|
||||
## Using AWS Multi-Factor Authentication
|
||||
|
|
@ -39,7 +42,7 @@ If you have selected "plans and applies", you will be prompted to enter your tok
|
|||
|
||||
## Using AWS Multi-Factor Authentication with AWS STS AssumeRole
|
||||
|
||||
The AWS Secure Token Service can be used to return a set of temporary security credentials that a user can use to access resources that they might not normally have access to (known as AssumeRole). The AssumeRole workflow is compatible with AWS multi-factor authentication in Atlas.
|
||||
The AWS Secure Token Service can be used to return a set of temporary security credentials that a user can use to access resources that they might not normally have access to (known as AssumeRole). The AssumeRole workflow is compatible with AWS multi-factor authentication in Terraform Enterprise.
|
||||
|
||||
To use AssumeRole, you first need to create an IAM role and edit the trust relationship policy document to contain the following:
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
layout: "docs"
|
||||
layout: "enterprise"
|
||||
page_title: "Contacting Support"
|
||||
sidebar_current: "docs-enterprise-support"
|
||||
description: |-
|
||||
|
|
|
|||
|
|
@ -544,44 +544,8 @@
|
|||
</li>
|
||||
|
||||
<li<%= sidebar_current("docs-enterprise") %>>
|
||||
<a href="/docs/enterprise/features.html">Terraform Enterprise</a>
|
||||
<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>
|
||||
<li<%= sidebar_current("docs-enterprise-artifact") %>>
|
||||
<a href="/docs/enterprise/artifacts/index.html">Artifacts</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-vcs") %>>
|
||||
<a href="/docs/enterprise/vcs/index.html">VCS Integration</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-packer") %>>
|
||||
<a href="/docs/enterprise/packer/index.html">Packer</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-api") %>>
|
||||
<a href="/docs/enterprise/api/index.html">API</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-accounts") %>>
|
||||
<a href="/docs/enterprise/user-accounts/index.html">User Accounts</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-organizations") %>>
|
||||
<a href="/docs/enterprise/organizations/index.html">Organizations</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-billing") %>>
|
||||
<a href="/docs/enterprise/billing/index.html">Billing</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-glossary") %>>
|
||||
<a href="/docs/enterprise/glossary/index.html">Glossary</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-faq") %>>
|
||||
<a href="/docs/enterprise/faq/index.html">FAQ</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-support") %>>
|
||||
<a href="/docs/enterprise/support.html">Contact Support</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,53 @@
|
|||
<% wrap_layout :inner do %>
|
||||
<% content_for :sidebar do %>
|
||||
<div class="docs-sidebar hidden-print affix-top" role="complementary">
|
||||
<ul class="nav docs-sidenav">
|
||||
<li<%= sidebar_current("docs-home") %>>
|
||||
<a href="/docs/index.html">Documentation Home</a>
|
||||
</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>
|
||||
<li<%= sidebar_current("docs-enterprise-artifact") %>>
|
||||
<a href="/docs/enterprise/artifacts/index.html">Artifacts</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-vcs") %>>
|
||||
<a href="/docs/enterprise/vcs/index.html">VCS Integration</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-packer") %>>
|
||||
<a href="/docs/enterprise/packer/index.html">Packer</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-api") %>>
|
||||
<a href="/docs/enterprise/api/index.html">API</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-accounts") %>>
|
||||
<a href="/docs/enterprise/user-accounts/index.html">User Accounts</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-organizations") %>>
|
||||
<a href="/docs/enterprise/organizations/index.html">Organizations</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-glossary") %>>
|
||||
<a href="/docs/enterprise/glossary/index.html">Glossary</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-faq") %>>
|
||||
<a href="/docs/enterprise/faq/index.html">FAQ</a>
|
||||
</li>
|
||||
<li<%= sidebar_current("docs-enterprise-support") %>>
|
||||
<a href="/docs/enterprise/support.html">Contact Support</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<%= yield %>
|
||||
<% end %>
|
||||
Loading…
Reference in New Issue