Skip to content

Commit 68aa294

Browse files
committed
Merge pull request #2369 from carmstrong/add_coreos_version
docs(*): specify required CoreOS version
2 parents 4c70228 + c45348b commit 68aa294

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Trying out Deis? Continue following these instructions for a local installation
2121
* Due to its nature as a distributed system, we strongly recommend using Deis with a minimum of 3 nodes even for local development and testing
2222
* The Deis "control plane" containers will consume approximately 2 GB of RAM across the cluster. Please be sure you have sufficient free memory before proceeding.
2323
* Install [Vagrant v1.6.5+](http://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
24+
* Deis requires CoreOS version 471.1.0 or more recent for Ceph FS support in the kernel. The Vagrantfile and cloud provider provision scripts will provision a recent CoreOS release, but manual installs need to ensure this version.
2425

2526
Note for Ubuntu users: the VirtualBox package in Ubuntu (as of the last known release for 14.04) has some issues when running in RAM-constrained environments. Please install the latest version of VirtualBox from Oracle's website.
2627

docs/installing_deis/baremetal.rst

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Deis clusters can be provisioned anywhere `CoreOS`_ can, including on your own h
1010
CoreOS running on raw hardware, you can boot with `PXE`_ or `iPXE`_ - this will boot a CoreOS
1111
machine running entirely from RAM. Then, you can `install CoreOS to disk`_.
1212

13+
.. important::
14+
15+
Deis requires CoreOS version 471.1.0 or more recent for Ceph FS support in the kernel.
16+
1317

1418
Generate SSH key
1519
----------------
@@ -97,9 +101,8 @@ Start the installation
97101
coreos-install -C alpha -c /tmp/config -d /dev/sda
98102
99103
100-
This will install the current `CoreOS`_ release to disk. If you want to install the recommended
101-
`CoreOS`_ version, check the `Deis changelog`_ and specify that version by appending the ``-V``
102-
parameter to the install command, e.g. ``-V 472.0.0``.
104+
This will install the latest `CoreOS`_ alpha release to disk. To specify a specific CoreOS version,
105+
append the ``-V`` parameter to the install command, e.g. ``-V 472.0.0``.
103106

104107
After the installation has finished, reboot your server. Once your machine is back up, you should
105108
be able to log in as the `core` user using the `deis` ssh key.
@@ -163,8 +166,7 @@ disk. Add the following block to the ``write_files`` section:
163166
164167
.. _`cluster size`: https://github.com/coreos/etcd/blob/master/Documentation/optimal-cluster-size.md
165168
.. _`CoreOS`: https://coreos.com/
166-
.. _`Deis changelog`: https://github.com/deis/deis/blob/master/CHANGELOG.md
167169
.. _`etcd`: https://github.com/coreos/etcd
168170
.. _`install CoreOS to disk`: https://coreos.com/docs/running-coreos/bare-metal/installing-to-disk/
169171
.. _`iPXE`: https://coreos.com/docs/running-coreos/bare-metal/booting-with-ipxe/
170-
.. _`PXE`: https://coreos.com/docs/running-coreos/bare-metal/booting-with-pxe/
172+
.. _`PXE`: https://coreos.com/docs/running-coreos/bare-metal/booting-with-pxe/

docs/installing_deis/index.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
Installing Deis
88
================
99

10-
The `controller` is the brains of a Deis platform. Provisioning a Deis
11-
controller is a matter of creating one or more :ref:`concepts_coreos`
12-
machines and installing a few necessary *systemd* units to manage
13-
Docker containers.
10+
Provisioning Deis is a matter of creating one or more :ref:`concepts_coreos`
11+
machines and using :ref:`install_deisctl` to install and start Deis.
1412

1513
Anywhere you can run CoreOS, you can run Deis, including most cloud
1614
providers, virtual machines, and bare metal. See the

0 commit comments

Comments
 (0)