Skip to content

Commit 6b8e849

Browse files
committed
Merge pull request #982 from deis/update-provision-doc
docs(bare-metal): filled in bare metal section in provision doc
2 parents bdbf50b + db2d845 commit 6b8e849

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

docs/operations/configure-dns.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ The DNS records for Deis should be configured as such:
2222
* ``deis.example.org`` should resolve to the IP of the machine that runs ``deis-controller``
2323
* ``*.deis.example.org`` (a wildcard DNS entry) should point to the load balancer (or the same machine for 1-node Vagrant, or any single instance of ``deis-router`` if one likes to live life on the edge)
2424

25-
These records are necessary for all deployments of Deis (EC2, Rackspace, multi-node Vagrant) except for a local, one-node Vagrant setup, which can use ``local.deisapp.com``.
25+
These records are necessary for all deployments of Deis (EC2, Rackspace, bare metal, multi-node Vagrant) except for a local, one-node Vagrant setup, which can use ``local.deisapp.com``.

docs/operations/provision-controller.rst

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ provision a multi-node Deis cluster on Rackspace_ cloud.
3333
Please see `contrib/rackspace`_ for details on using Deis on
3434
Rackspace cloud.
3535

36+
Bare Metal
37+
----------
38+
The `contrib/bare-metal` section of the Deis project includes documentation in
39+
README.md to help with provisioning a multi-node cluster on your own hardware.
40+
41+
Please see `contrib/bare-metal`_ for details on using Deis on bare metal.
42+
3643
Vagrant
3744
-------
3845
The root of the Deis project includes documentation in README.md, a
@@ -47,6 +54,6 @@ Please see README.md_ for details on using Deis with Vagrant.
4754
.. _`contrib/ec2`: https://github.com/deis/deis/tree/master/contrib/ec2
4855
.. _Rackspace: https://github.com/deis/deis/tree/master/contrib/rackspace#readme
4956
.. _`contrib/rackspace`: https://github.com/deis/deis/tree/master/contrib/rackspace
57+
.. _`contrib/bare-metal`: https://github.com/deis/deis/tree/master/contrib/bare-metal
5058
.. _Vagrant: http://www.vagrantup.com/
5159
.. _README.md: https://github.com/deis/deis/tree/master/README.md
52-

0 commit comments

Comments
 (0)