From a71c5ebfee89917d9ebf80c8413f27372f96d6c1 Mon Sep 17 00:00:00 2001 From: Chris Riley Date: Mon, 27 Mar 2017 11:48:57 -0700 Subject: [PATCH] Removed FTE "billing" doc and added FTE level of hierarchy --- .../docs/enterprise/billing/index.html.md | 116 ------------------ .../docs/enterprise/glossary/index.html.md | 2 +- website/source/docs/enterprise/index.html.md | 2 +- .../runs/multifactor-authentication.html.md | 15 ++- .../source/docs/enterprise/support.html.md | 2 +- website/source/layouts/docs.erb | 38 +----- website/source/layouts/enterprise.erb | 53 ++++++++ 7 files changed, 66 insertions(+), 162 deletions(-) delete mode 100755 website/source/docs/enterprise/billing/index.html.md create mode 100644 website/source/layouts/enterprise.erb diff --git a/website/source/docs/enterprise/billing/index.html.md b/website/source/docs/enterprise/billing/index.html.md deleted file mode 100755 index 3cd8c37db..000000000 --- a/website/source/docs/enterprise/billing/index.html.md +++ /dev/null @@ -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. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ProviderResource TypeResource Property
AWS`aws_instance``count`
AWS - `aws_autoscaling_group``count` `desired_capacity`
Azure`azure_instance``count`
Azure`azurerm_virtual_machine``count`
CenturyLink Cloud`clc_server``count`
CloudStack`cloudstack_instance``count`
DigitalOcean`digitalocean_droplet``count`
Google Cloud`google_compute_instance``count`
Google Cloud`compute_instance_group_manager``count` `target_size`
Heroku`heroku_app``count`
OpenStack`openstack_compute_instance_v2``count`
Packet`packet_device``count`
Triton`triton_machine``count`
VMware vCloud Director`vcd_vapp``count`
VMware vSphere provider`vsphere_virtual_machine``count`
- -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). diff --git a/website/source/docs/enterprise/glossary/index.html.md b/website/source/docs/enterprise/glossary/index.html.md index af1b7ecdf..1b537b605 100755 --- a/website/source/docs/enterprise/glossary/index.html.md +++ b/website/source/docs/enterprise/glossary/index.html.md @@ -1,5 +1,5 @@ --- -layout: "docs" +layout: "enterprise" page_title: "Terraform Enterprise Glossary" sidebar_current: "docs-enterprise" description: |- diff --git a/website/source/docs/enterprise/index.html.md b/website/source/docs/enterprise/index.html.md index 3fb6eddf3..28ef8cd4f 100755 --- a/website/source/docs/enterprise/index.html.md +++ b/website/source/docs/enterprise/index.html.md @@ -1,5 +1,5 @@ --- -layout: "docs" +layout: "enterprise" page_title: "Terraform Enterprise Features" sidebar_current: "docs-enterprise" description: |- diff --git a/website/source/docs/enterprise/runs/multifactor-authentication.html.md b/website/source/docs/enterprise/runs/multifactor-authentication.html.md index 7f2fad06f..2732882ab 100755 --- a/website/source/docs/enterprise/runs/multifactor-authentication.html.md +++ b/website/source/docs/enterprise/runs/multifactor-authentication.html.md @@ -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//environments//settings`. Use the drop down labeled "AWS Multi-Factor Authentication +To enable multi-factor authentication, visit the environment settings page: `terraform//environments//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: diff --git a/website/source/docs/enterprise/support.html.md b/website/source/docs/enterprise/support.html.md index 3770583be..46f7b4d98 100755 --- a/website/source/docs/enterprise/support.html.md +++ b/website/source/docs/enterprise/support.html.md @@ -1,5 +1,5 @@ --- -layout: "docs" +layout: "enterprise" page_title: "Contacting Support" sidebar_current: "docs-enterprise-support" description: |- diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 3bd2d5069..ded2e3fcb 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -544,44 +544,8 @@ > - Terraform Enterprise + Terraform Enterprise diff --git a/website/source/layouts/enterprise.erb b/website/source/layouts/enterprise.erb new file mode 100644 index 000000000..a52a44c20 --- /dev/null +++ b/website/source/layouts/enterprise.erb @@ -0,0 +1,53 @@ +<% wrap_layout :inner do %> + <% content_for :sidebar do %> + + <% end %> + + <%= yield %> +<% end %>