diff --git a/website/source/api/agent.html.md b/website/source/api/agent.html.md
index a762233ff..cd590bc57 100644
--- a/website/source/api/agent.html.md
+++ b/website/source/api/agent.html.md
@@ -173,11 +173,6 @@ $ curl \
"RPC": "127.0.0.1:4647",
"Serf": "127.0.0.1:4648"
},
- "Atlas": {
- "Endpoint": "",
- "Infrastructure": "",
- "Join": false
- },
"BindAddr": "127.0.0.1",
"Client": {
"AllocDir": "",
diff --git a/website/source/docs/agent/configuration/atlas.html.md b/website/source/docs/agent/configuration/atlas.html.md
deleted file mode 100644
index ef7dabba3..000000000
--- a/website/source/docs/agent/configuration/atlas.html.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-layout: "docs"
-page_title: "atlas Stanza - Agent Configuration"
-sidebar_current: "docs-agent-configuration-atlas"
-description: |-
- The `atlas` stanza configures Nomad's integration with HashiCorp's Atlas and
- Nomad Enterprise.
----
-
-# `atlas` Stanza
-
-
-
- | Placement |
-
- **atlas**
- |
-
-
-
-
-The `atlas` stanza configures Nomad's integration with
-[HashiCorp's Atlas][atlas] and Nomad Enterprise.
-
-```hcl
-atlas {
- infrastructure = "hashicorp/example"
- join = true
-}
-```
-
-~> Nomad integration with Atlas is **currently in private beta** and only
-available to select users. As the functionality becomes more widely available,
-additional examples and documented will be listed here.
-
-## `atlas` Parameters
-
-- `endpoint` `(string: "https://atlas.hashicorp.com")` - Specifies the address
- of the Atlas service to connect.
-
-- `infrastructure` `(string: )` - Specifies the name of the Atlas
- infrastructure to connect the agent. This should be of the form
- `/`, and requires a valid `token`
-
-- `join` `(bool: false)` - Specifies if the auto-join functionality should be
- enabled.
-
-- `token` `(string: )` - Specifies the Atlas token to use for
- authentication. This token must have access to the provided `infrastructure`.
- This can also optionally be specified using the `ATLAS_TOKEN` environment
- variable.
-
-## `atlas` Examples
-
-The following examples only show the `atlas` stanzas. Remember that the
-`atlas` stanza is only valid in the placements listed above.
-
-### Nomad Enterprise SaaS
-
-This example connects to the public Nomad Enterprise service to the
-infrastructure named "hashicorp/example". The provided token must have
-permissions to manage the infrastructure or access will be denied.
-
-```hcl
-atlas {
- infrastructure = "hashicorp/example"
- token = "abcd.atlasv1.efghi...."
- join = true
-}
-```
-
-### On-Premise Nomad Enterprise
-
-This example connects to a custom Nomad Enterprise server, such as an on-premise
-installation.
-
-```hcl
-atlas {
- endpoint = "https://corp.atlas.local/"
- infrastructure = "acme/example"
- join = true
-}
-```
-
-[atlas]: https://atlas.hashicorp.com/ "Atlas by HashiCorp"
diff --git a/website/source/docs/agent/configuration/client.html.md b/website/source/docs/agent/configuration/client.html.md
index b817c154b..16b6afb24 100644
--- a/website/source/docs/agent/configuration/client.html.md
+++ b/website/source/docs/agent/configuration/client.html.md
@@ -195,7 +195,6 @@ see the [drivers documentation](/docs/drivers/index.html).
```text
CONSUL_TOKEN
VAULT_TOKEN
- ATLAS_TOKEN
AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY
AWS_SESSION_TOKEN
diff --git a/website/source/docs/agent/configuration/index.html.md b/website/source/docs/agent/configuration/index.html.md
index e9ae41cb0..da1164a8b 100644
--- a/website/source/docs/agent/configuration/index.html.md
+++ b/website/source/docs/agent/configuration/index.html.md
@@ -66,10 +66,6 @@ consul {
address = "1.2.3.4:8500"
}
-atlas {
- infrastructure = "hashicorp/mars"
- token = "atlas.v1.AFE84330943"
-}
```
~> Note that it is strongly recommended **not** to operate a node as both
@@ -114,9 +110,6 @@ testing.
reachable from all server nodes. It is not required that clients can reach
this address.
-- `atlas` ([Atlas][atlas]: nil) - Specifies if Nomad should connect
- to Nomad Enterprise and Atlas.
-
- `bind_addr` `(string: "0.0.0.0")` - Specifies which address the Nomad
agent should bind to for network services, including the HTTP interface as
well as the internal gossip protocol and RPC mechanism. This should be
@@ -233,7 +226,6 @@ http_api_response_headers {
[hcl]: https://github.com/hashicorp/hcl "HashiCorp Configuration Language"
[go-sockaddr/template]: https://godoc.org/github.com/hashicorp/go-sockaddr/template
[consul]: /docs/agent/configuration/consul.html "Nomad Agent consul Configuration"
-[atlas]: /docs/agent/configuration/atlas.html "Nomad Agent atlas Configuration"
[vault]: /docs/agent/configuration/vault.html "Nomad Agent vault Configuration"
[tls]: /docs/agent/configuration/tls.html "Nomad Agent tls Configuration"
[client]: /docs/agent/configuration/client.html "Nomad Agent client Configuration"
diff --git a/website/source/docs/agent/index.html.md b/website/source/docs/agent/index.html.md
index def7adaf2..5e927f489 100644
--- a/website/source/docs/agent/index.html.md
+++ b/website/source/docs/agent/index.html.md
@@ -46,7 +46,6 @@ $ nomad agent -dev
==> Starting Nomad agent...
==> Nomad agent configuration:
- Atlas: (Infrastructure: 'hashicorp/example' Join: false)
Client: true
Log Level: INFO
Region: global (DC: dc1)
@@ -61,11 +60,6 @@ $ nomad agent -dev
There are several important messages that `nomad agent` outputs:
-- **Atlas**: This shows the [Atlas infrastructure](https://atlas.hashicorp.com)
- with which the node is registered, if any. It also indicates if auto-join is
- enabled. The Atlas infrastructure is set using `-atlas` and auto-join is
- enabled by setting `-atlas-join`.
-
- **Client**: This indicates whether the agent has enabled client mode.
Client nodes fingerprint their host environment, register with servers,
and run tasks.
diff --git a/website/source/docs/commands/agent.html.md.erb b/website/source/docs/commands/agent.html.md.erb
index 468d6ae85..3544a8c50 100644
--- a/website/source/docs/commands/agent.html.md.erb
+++ b/website/source/docs/commands/agent.html.md.erb
@@ -24,10 +24,6 @@ via CLI arguments. The `agent` command accepts the following arguments:
* `-alloc-dir=`: Equivalent to the Client [alloc_dir](#alloc_dir) config
option.
-* `-atlas=`: Equivalent to the Atlas
- [infrastructure](#infrastructure) config option.
-* `-atlas-join`: Equivalent to the Atlas [join](#join) config option.
-* `-atlas-token=`: Equivalent to the Atlas [token](#token) config option.
* `-bind=`: Equivalent to the [bind_addr](#bind_addr) config option.
* `-bootstrap-expect=`: Equivalent to the
[bootstrap_expect](#bootstrap_expect) config option.
diff --git a/website/source/docs/faq.html.md b/website/source/docs/faq.html.md
index 1c5f90667..e62085186 100644
--- a/website/source/docs/faq.html.md
+++ b/website/source/docs/faq.html.md
@@ -19,15 +19,6 @@ This anonymous ID can can be disabled. Using the Checkpoint service is optional
See [`disable_anonymous_signature`](/docs/agent/configuration/index.html#disable_anonymous_signature)
and [`disable_update_check`](/docs/agent/configuration/index.html#disable_update_check).
-## Q: How does Atlas integration work?
-
-Nomad makes use of a HashiCorp service called [SCADA](http://scada.hashicorp.com)
-(Supervisory Control And Data Acquisition). The SCADA system allows clients to maintain
-long-running connections to Atlas. Atlas can in turn provide auto-join facilities for
-Nomad agents (supervisory control) and a dashboard showing the state of the system (data acquisition).
-
-Using the SCADA service is optional. SCADA is only enabled by opt-in.
-
## Q: Is Nomad eventually or strongly consistent?
Nomad makes use of both a [consensus protocol](/docs/internals/consensus.html) and
diff --git a/website/source/intro/getting-started/cluster.html.md b/website/source/intro/getting-started/cluster.html.md
index 3b3a37723..6affed4e9 100644
--- a/website/source/intro/getting-started/cluster.html.md
+++ b/website/source/intro/getting-started/cluster.html.md
@@ -49,7 +49,6 @@ $ sudo nomad agent -config server.hcl
==> Starting Nomad agent...
==> Nomad agent configuration:
- Atlas:
Client: false
Log Level: DEBUG
Region: global (DC: dc1)
@@ -122,7 +121,6 @@ $ sudo nomad agent -config client1.hcl
==> Starting Nomad agent...
==> Nomad agent configuration:
- Atlas:
Client: true
Log Level: DEBUG
Region: global (DC: dc1)
diff --git a/website/source/intro/getting-started/running.html.md b/website/source/intro/getting-started/running.html.md
index 5cbcbb739..1ce0d6613 100644
--- a/website/source/intro/getting-started/running.html.md
+++ b/website/source/intro/getting-started/running.html.md
@@ -32,7 +32,6 @@ vagrant@nomad:~$ sudo nomad agent -dev
==> Starting Nomad agent...
==> Nomad agent configuration:
- Atlas:
Client: true
Log Level: DEBUG
Region: global (DC: dc1)
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 854692613..6c6b9ec38 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -257,9 +257,6 @@
>
Configuration