haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #12 from hashicorp/sethvargo/atlas_that_shit_dude 

Vagrant Cloud -> Atlas
This commit is contained in:
Seth Vargo 2014-12-08 18:26:29 -08:00
parent 10713ebe7f 2e4f854725
commit 1d853b32e6
15 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/action/builtin/box_add.rb
View File

@ -147,7 +147,7 @@ module Vagrant
# element is an authenticated URL. # element is an authenticated URL.
# @param [Hash] env # @param [Hash] env
# @param [Bool] expanded True if the metadata URL was expanded with # @param [Bool] expanded True if the metadata URL was expanded with
# a Vagrant Cloud server URL. # a Atlas server URL.
def add_from_metadata(url, env, expanded) def add_from_metadata(url, env, expanded)
original_url = env[:box_url] original_url = env[:box_url]
provider = env[:box_provider] provider = env[:box_provider]

4
lib/vagrant/shared_helpers.rb
View File

@ -5,12 +5,12 @@ require "thread"
module Vagrant module Vagrant
@@global_lock = Mutex.new @@global_lock = Mutex.new
# This is the default endpoint of the Vagrant Cloud in # This is the default endpoint of the Atlas in
# use. API calls will be made to this for various functions # use. API calls will be made to this for various functions
# of Vagrant that may require remote access. # of Vagrant that may require remote access.
# #
# @return [String] # @return [String]
DEFAULT_SERVER_URL = "https://vagrantcloud.com" DEFAULT_SERVER_URL = "https://atlas.hashicorp.com"
# This holds a global lock for the duration of the block. This should # This holds a global lock for the duration of the block. This should
# be invoked around anything that is modifying process state (such as # be invoked around anything that is modifying process state (such as

2
plugins/commands/box/command/add.rb
View File

@ -47,7 +47,7 @@ module VagrantPlugins
end end
o.separator "" o.separator ""
o.separator "The box descriptor can be the name of a box on Vagrant Cloud," o.separator "The box descriptor can be the name of a box on HashiCorp's Atlas,"
o.separator "or a URL, or a local .box file, or a local .json file containing" o.separator "or a URL, or a local .box file, or a local .json file containing"
o.separator "the catalog metadata." o.separator "the catalog metadata."
o.separator "" o.separator ""

20
templates/locales/en.yml
View File

@ -369,7 +369,7 @@ en:
provider. Double-check your requested provider to verify you didn't provider. Double-check your requested provider to verify you didn't
simply misspell it. simply misspell it.
If you're adding a box from Vagrant Cloud, make sure the box is If you're adding a box from HashiCorp's Atlas, make sure the box is
released. released.
Name: %{name} Name: %{name}
@ -388,7 +388,7 @@ en:
box_add_short_not_found: |- box_add_short_not_found: |-
The box '%{name}' could not be found or The box '%{name}' could not be found or
could not be accessed in the remote catalog. If this is a private could not be accessed in the remote catalog. If this is a private
box on Vagrant Cloud, please verify you're logged in via box on HashiCorp's Atlas, please verify you're logged in via
`vagrant login`. Also, please double-check the name. The expanded `vagrant login`. Also, please double-check the name. The expanded
URL and error message are shown below: URL and error message are shown below:
@ -550,16 +550,14 @@ en:
%{versions} %{versions}
box_server_not_set: |- box_server_not_set: |-
A URL to a Vagrant Cloud server is not set, so boxes cannot A URL to an Atlas server is not set, so boxes cannot be added with a
be added with a shorthand ("mitchellh/precise64") format. shorthand ("mitchellh/precise64") format. You may also be seeing this
You may also be seeing this error if you meant to type in error if you meant to type in a path to a box file which doesn't exist
a path to a box file which doesn't exist locally on your locally on your system.
system.
To set a URL to a Vagrant Cloud server, set the To set a URL to an Atlas server, set the `VAGRANT_SERVER_URL`
`VAGRANT_SERVER_URL` environmental variable. Or, if you environmental variable. Or, if you meant to use a file path, make sure
meant to use a file path, make sure the path to the file the path to the file is valid.
is valid.
box_update_multi_provider: |- box_update_multi_provider: |-
You requested to update the box '%{name}'. This box has You requested to update the box '%{name}'. This box has
multiple providers. You must explicitly select a single multiple providers. You must explicitly select a single

4
website/docs/source/v2/boxes.html.md
View File

@ -14,7 +14,7 @@ boxes. You can read the documentation on the [vagrant box](/v2/cli/box.html)
command for more information. command for more information.
The easiest way to use a box is to add a box from the The easiest way to use a box is to add a box from the
[publicly available catalog of Vagrant boxes](https://vagrantcloud.com). [publicly available catalog of Vagrant boxes](https://atlas.hashicorp.com).
You can also add and share your own customized boxes on this website. You can also add and share your own customized boxes on this website.
Boxes also support versioning so that members of your team using Vagrant Boxes also support versioning so that members of your team using Vagrant
@ -27,7 +27,7 @@ sub-pages in the navigation to the left.
## Discovering Boxes ## Discovering Boxes
The easiest way to find boxes is to look on the The easiest way to find boxes is to look on the
[public Vagrant box catalog](https://vagrantcloud.com) [public Vagrant box catalog](https://atlas.hashicorp.com)
for a box matching your use case. The catalog contains most major operating for a box matching your use case. The catalog contains most major operating
systems as bases, as well as specialized boxes to get you up and running systems as bases, as well as specialized boxes to get you up and running
quickly with LAMP stacks, Ruby, Python, etc. quickly with LAMP stacks, Ruby, Python, etc.

2
website/docs/source/v2/boxes/base.html.md
View File

@ -239,7 +239,7 @@ provider-specific guides are linked to towards the top of this page.
You can distribute the box file however you'd like. However, if you want You can distribute the box file however you'd like. However, if you want
to support versioning, putting multiple providers at a single URL, pushing to support versioning, putting multiple providers at a single URL, pushing
updates, analytics, and more, we recommend you add the box to updates, analytics, and more, we recommend you add the box to
[Vagrant Cloud](https://vagrantcloud.com). [HashiCorp's Atlas](https://atlas.hashicorp.com).
You can upload both public and private boxes to this service. You can upload both public and private boxes to this service.

6
website/docs/source/v2/boxes/format.html.md
View File

@ -23,7 +23,7 @@ Today, there are two different components:
box file and so on. box file and so on.
* Box Catalog Metadata - This is a JSON document (typically exchanged * Box Catalog Metadata - This is a JSON document (typically exchanged
during interactions with [Vagrant Cloud](https://vagrantcloud.com)) during interactions with [HashiCorp's Atlas](https://atlas.hashicorp.com))
that specifies the name of the box, a description, available that specifies the name of the box, a description, available
versions, available providers, and URLs to the actual box files versions, available providers, and URLs to the actual box files
(next component) for each provider and version. If this catalog (next component) for each provider and version. If this catalog
@ -78,8 +78,8 @@ providers from a single file, and more.
<div class="alert alert-block alert-info"> <div class="alert alert-block alert-info">
<strong>You don't need to manually make the metadata.</strong> If you <strong>You don't need to manually make the metadata.</strong> If you
have an account with <a href="https://vagrantcloud.com">Vagrant Cloud</a>, you have an account with <a href="https://atlas.hashicorp.com">HashiCorp's Atlas</a>, you
can create boxes there, and Vagrant Cloud automatically creates can create boxes there, and HashiCorp's Atlas automatically creates
the metadata for you. The format is still documented here. the metadata for you. The format is still documented here.
</div> </div>

6
website/docs/source/v2/boxes/versioning.html.md
View File

@ -24,10 +24,10 @@ to update your own custom boxes with versions. That is covered in
`vagrant box list` only shows _installed_ versions of boxes. If you want `vagrant box list` only shows _installed_ versions of boxes. If you want
to see all available versions of a box, you'll have to find the box to see all available versions of a box, you'll have to find the box
on [Vagrant Cloud](https://vagrantcloud.com). An easy way to find a box on [HashiCorp's Atlas](https://atlas.hashicorp.com). An easy way to find a box
is to use the url `https://vagrantcloud.com/USER/BOX`. For example, for is to use the url `https://atlas.hashicorp.com/USER/BOX`. For example, for
the `hashicorp/precise64` box, you can find information about it at the `hashicorp/precise64` box, you can find information about it at
`https://vagrantcloud.com/hashicorp/precise64`. `https://atlas.hashicorp.com/hashicorp/precise64`.
You can check if the box you're using is outdated with `vagrant box outdated`. You can check if the box you're using is outdated with `vagrant box outdated`.
This can check if the box in your current Vagrant environment is outdated This can check if the box in your current Vagrant environment is outdated

8
website/docs/source/v2/cli/box.html.md
View File

@ -26,10 +26,10 @@ This adds a box with the given address to Vagrant. The address can be
one of three things: one of three things:
* A shorthand name from the * A shorthand name from the
[public catalog of available Vagrant images](https://vagrantcloud.com), [public catalog of available Vagrant images](https://atlas.hashicorp.com),
such as "hashicorp/precise64". such as "hashicorp/precise64".
* File path or HTTP URL to a box in a [catalog](https://vagrantcloud.com). * File path or HTTP URL to a box in a [catalog](https://atlas.hashicorp.com).
For HTTP, basic authentication is supported and `http_proxy` environmental For HTTP, basic authentication is supported and `http_proxy` environmental
variables are respected. HTTPS is also supported. variables are respected. HTTPS is also supported.
@ -93,8 +93,8 @@ you're not using a catalog).
to be specified. to be specified.
<div class="alert alert-block alert-warn"> <div class="alert alert-block alert-warn">
<strong>Checksums for versioned boxes or boxes from Vagrant Cloud:</strong> <strong>Checksums for versioned boxes or boxes from HashiCorp's Atlas:</strong>
For boxes from Vagrant Cloud, the checksums are embedded in the metadata For boxes from HashiCorp's Atlas, the checksums are embedded in the metadata
of the box. The metadata itself is served over TLS and its format is validated. of the box. The metadata itself is served over TLS and its format is validated.
</div> </div>

2
website/docs/source/v2/cli/login.html.md
View File

@ -8,7 +8,7 @@ sidebar_current: "cli-login"
**Command: `vagrant login`** **Command: `vagrant login`**
The login command is used to authenticate with a The login command is used to authenticate with a
[Vagrant Cloud](https://vagrantcloud.com) server. Logging is only [HashiCorp's Atlas](https://atlas.hashicorp.com) server. Logging is only
necessary if you're accessing protected boxes or using necessary if you're accessing protected boxes or using
[Vagrant Share](/v2/share/index.html). [Vagrant Share](/v2/share/index.html).

12
website/docs/source/v2/getting-started/boxes.html.md
View File

@ -27,8 +27,8 @@ $ vagrant box add hashicorp/precise32
``` ```
This will download the box named "hashicorp/precise32" from This will download the box named "hashicorp/precise32" from
[Vagrant Cloud](https://vagrantcloud.com), a place where you can find [HashiCorp's Atlas](https://atlas.hashicorp.com), a place where you can find
and host boxes. While it is easiest to download boxes from Vagrant Cloud and host boxes. While it is easiest to download boxes from HashiCorp's Atlas
you can also add boxes from a local file, custom URL, etc. you can also add boxes from a local file, custom URL, etc.
Added boxes can be re-used by multiple projects. Each project uses a box Added boxes can be re-used by multiple projects. Each project uses a box
@ -64,11 +64,11 @@ For the remainder of this getting started guide, we'll only use the
this getting started guide, the first question you'll probably have is this getting started guide, the first question you'll probably have is
"where do I find more boxes?" "where do I find more boxes?"
The best place to find more boxes is [Vagrant Cloud](https://vagrantcloud.com). The best place to find more boxes is [HashiCorp's Atlas](https://atlas.hashicorp.com).
Vagrant Cloud has a public directory of freely available boxes that HashiCorp's Atlas has a public directory of freely available boxes that
run various platforms and technologies. Vagrant Cloud also has a great search run various platforms and technologies. HashiCorp's Atlas also has a great search
feature to allow you to find the box you care about. feature to allow you to find the box you care about.
In addition to finding free boxes, Vagrant Cloud lets you host your own In addition to finding free boxes, HashiCorp's Atlas lets you host your own
boxes, as well as private boxes if you intend on creating boxes for your boxes, as well as private boxes if you intend on creating boxes for your
own organization. own organization.

4
website/docs/source/v2/getting-started/share.html.md
View File

@ -15,10 +15,10 @@ Vagrant Share lets you share your Vagrant environment to anyone around the
world. It will give you a URL that will route directly to your Vagrant world. It will give you a URL that will route directly to your Vagrant
environment from any device in the world that is connected to the internet. environment from any device in the world that is connected to the internet.
## Login to Vagrant Cloud ## Login to HashiCorp's Atlas
Before being able to share your Vagrant environment, you'll need an account on Before being able to share your Vagrant environment, you'll need an account on
[Vagrant Cloud](https://vagrantcloud.com). Don't worry, it's free. [HashiCorp's Atlas](https://atlas.hashicorp.com). Don't worry, it's free.
Once you have an account, log in using `vagrant login`: Once you have an account, log in using `vagrant login`:

2
website/docs/source/v2/hyperv/usage.html.md
View File

@ -17,5 +17,5 @@ admin rights. Vagrant will show you an error if it doesn't have the proper
permissions. permissions.
Boxes for Hyper-V can be easily found on Boxes for Hyper-V can be easily found on
[Vagrant Cloud](https://vagrantcloud.com). To get started, you might [HashiCorp's Atlas](https://atlas.hashicorp.com). To get started, you might
want to try the `hashicorp/precise64` box. want to try the `hashicorp/precise64` box.

2
website/docs/source/v2/share/index.html.md
View File

@ -34,4 +34,4 @@ to the left. We also have a section where we go into detail about the
security implications of this feature. security implications of this feature.
Vagrant Share requires an account with Vagrant Share requires an account with
[Vagrant Cloud](https://vagrantcloud.com) to be used. [HashiCorp's Atlas](https://atlas.hashicorp.com) to be used.

6
website/docs/source/v2/vagrantfile/machine_settings.html.md
View File

@ -20,7 +20,7 @@ for the machine to boot and be accessible. By default this is 300 seconds.
`config.vm.box` - This configures what [box](/v2/boxes.html) the `config.vm.box` - This configures what [box](/v2/boxes.html) the
machine will be brought up against. The value here should be the name machine will be brought up against. The value here should be the name
of an installed box or a shorthand name of a box in of an installed box or a shorthand name of a box in
[Vagrant Cloud](https://vagrantcloud.com). [HashiCorp's Atlas](https://atlas.hashicorp.com).
<hr> <hr>
@ -28,7 +28,7 @@ of an installed box or a shorthand name of a box in
the configured box on every `vagrant up`. If an update is found, Vagrant the configured box on every `vagrant up`. If an update is found, Vagrant
will tell the user. By default this is true. Updates will only be checked will tell the user. By default this is true. Updates will only be checked
for boxes that properly support updates (boxes from for boxes that properly support updates (boxes from
[Vagrant Cloud](https://vagrantcloud.com) [HashiCorp's Atlas](https://atlas.hashicorp.com)
or some other versioned box). or some other versioned box).
<hr> <hr>
@ -74,7 +74,7 @@ URL, then SSL certs will be verified.
<hr> <hr>
`config.vm.box_url` - The URL that the configured box can be found at. `config.vm.box_url` - The URL that the configured box can be found at.
If `config.vm.box` is a shorthand to a box in [Vagrant Cloud](https://vagrantcloud.com) If `config.vm.box` is a shorthand to a box in [HashiCorp's Atlas](https://atlas.hashicorp.com)
then this value doesn't need to be specified. Otherwise, it should then this value doesn't need to be specified. Otherwise, it should
point to the proper place where the box can be found if it isn't point to the proper place where the box can be found if it isn't
installed. installed.