Skip to content

Commit

Permalink
Merge pull request #241 from ru-fu/small-doc-updates
Browse files Browse the repository at this point in the history
Various small doc updates
  • Loading branch information
tomponline authored Dec 4, 2023
2 parents bebe3e7 + e6c4510 commit 848687d
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 8 deletions.
2 changes: 2 additions & 0 deletions doc/.custom_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ AGPL
backend
balancers
Ceph
Ceph's
CIDR
DCO
DHCP
Expand All @@ -12,6 +13,7 @@ GiB
IOV
IPv
LXD
LXD's
mDNS
MicroCeph
MicroCloud
Expand Down
5 changes: 3 additions & 2 deletions doc/custom_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
html_context = {

# Change to the link to your product website (without "https://")
'product_page': 'microcloud.is',
'product_page': 'canonical.com/microcloud',

# Add your product tag to ".sphinx/_static" and change the path
# here (start with "_static"), default is the circle of friends
Expand Down Expand Up @@ -170,5 +170,6 @@
## Add any configuration that is not covered by the common conf.py file.

intersphinx_mapping = {
'lxd': ('https://documentation.ubuntu.com/lxd/en/latest/', None)
'lxd': ('https://documentation.ubuntu.com/lxd/en/latest/', None),
'ceph': ('https://docs.ceph.com/en/latest/', None)
}
7 changes: 5 additions & 2 deletions doc/how-to/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ How to install MicroCloud

To install MicroCloud, install all required :ref:`snaps` on all machines that you want to include in your cluster.

To do so, enter the following command on all machines::
To do so, enter the following commands on all machines::

sudo snap install lxd microceph microovn microcloud --cohort="+"
sudo snap install lxd --cohort="+"
sudo snap install microceph --cohort="+"
sudo snap install microovn --cohort="+"
sudo snap install microcloud --cohort="+"

.. note::
Make sure to install the same version of the snaps on all machines.
Expand Down
10 changes: 8 additions & 2 deletions doc/how-to/snaps.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ Enter the following command to indefinitely hold all updates to the snaps needed
When you choose to update your installation, use the following commands to remove the hold, update the snaps, and hold the updates again::

sudo snap refresh --unhold lxd microceph microovn microcloud
sudo snap refresh lxd microceph microovn microcloud --cohort="+"
sudo snap refresh lxd --cohort="+"
sudo snap refresh microceph --cohort="+"
sudo snap refresh microovn --cohort="+"
sudo snap refresh microcloud --cohort="+"
sudo snap refresh --hold lxd microceph microovn microcloud

See `Hold refreshes`_ in the snap documentation for detailed information about holding snap updates.
Expand Down Expand Up @@ -101,7 +104,10 @@ This method can cause a problem for cluster updates if some cluster members are

To avoid this problem, use the ``--cohort="+"`` flag when refreshing your snaps::

sudo snap refresh lxd microceph microovn microcloud --cohort="+"
sudo snap refresh lxd --cohort="+"
sudo snap refresh microceph --cohort="+"
sudo snap refresh microovn --cohort="+"
sudo snap refresh microcloud --cohort="+"

This flag ensures that all machines in a cluster see the same snap revision and are therefore not affected by a progressive rollout.

Expand Down
4 changes: 4 additions & 0 deletions doc/reference/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ If you want to add further machines after the initial initialisation, you can us
To use local storage, each machine requires a local disk.
To use distributed storage, at least three additional disks (not only partitions) for use by Ceph are required, and these disks must be on at least three different machines.

Also see Ceph's :ref:`ceph:hardware-recommendations`.

Networking requirements
~~~~~~~~~~~~~~~~~~~~~~~

Expand All @@ -41,6 +43,8 @@ Software requirements

MicroCloud requires snapd version 2.59 or newer.

Also see LXD's :ref:`lxd:requirements` and Ceph's :doc:`ceph:start/os-recommendations`.

.. _snaps:

Snaps
Expand Down
6 changes: 4 additions & 2 deletions doc/tutorial/get_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,9 @@ Complete the following steps on each VM (``micro1``, ``micro2``, ``micro3``, and

#. Install the required snaps::

snap install microceph microovn microcloud --cohort="+"
snap install microceph --cohort="+"
snap install microovn --cohort="+"
snap install microcloud --cohort="+"

.. note::
The ``--cohort="+"`` flag in the command ensures that the same version of the snap is installed on all machines.
Expand Down Expand Up @@ -839,7 +841,7 @@ You can, however, create a different network to isolate some instances from othe

#. Launch an Ubuntu container that uses the new network::

lxc launch images:ubuntu/22.04 u4 --network isolated
lxc launch ubuntu:22.04 u4 --network isolated

#. Access the shell in ``u4``::

Expand Down

0 comments on commit 848687d

Please sign in to comment.