More commits to the landing page project.

Signed-off-by: Zac Dover <zac.dover@gmail.com>

diff --git a/doc/index.rst b/doc/index.rst
index 28151bcf3456041b4af6e0e0f938d1282756968b..1d63e6bfc7f93752f2b56ff344b8f244ce634391 100644 (file)
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -16,20 +16,21 @@ Basic Three-Node Installation Procedure
 Installing the First Node
 -------------------------
 
-#. Install a recent, supported Linux distribution on a computer.
-#. Install docker. On Fedora or Centos::
-
+1. Install a recent, supported Linux distribution on a computer.
+2. Install docker. On Fedora or Centos::
+   
    $ sudo dnf install docker 
 
   on Ubuntu or Debian::
+  
+   $ sudo apt install docker.io 
 
-   $ sudo apt install docker.io
-
-#. Fetch the cephadm utility from github to the computer that will be the Ceph manager::
+3.  Fetch the cephadm utility from github to the computer that will be the Ceph manager::
 
-   $ curl --silent --remote-name --location https://github.com/ceph/ceph/raw/master/src/cephadm/cephadm
+    $ curl --silent --remote-name --location https://github.com/ceph/ceph/raw/master/src/cephadm/cephadm
+   
 
-#. Make the cephadm utility executable::
+4. Make the cephadm utility executable::
 
    $ sudo chmod +x cephadm
 
@@ -44,44 +45,44 @@ Installing the First Node
   The output of a successful execution of this command is shown here::
 
    INFO:root:Cluster fsid: 335b6dac-064c-11ea-8243-48f17fe53909
-   INFO:ceph-daemon:Verifying we can ping mon IP 192.168.1.101...
-   INFO:ceph-daemon:Pulling latest ceph/daemon-base:latest-master-devel container...
-   INFO:ceph-daemon:Extracting ceph user uid/gid from container image...
-   INFO:ceph-daemon:Creating initial keys...
-   INFO:ceph-daemon:Creating initial monmap...
-   INFO:ceph-daemon:Creating mon...
-   INFO:ceph-daemon:Waiting for mon to start...
-   INFO:ceph-daemon:Assimilating anything we can from ceph.conf...
-   INFO:ceph-daemon:Generating new minimal ceph.conf...
-   INFO:ceph-daemon:Restarting the monitor...
-   INFO:ceph-daemon:Creating mgr...
-   INFO:ceph-daemon:Creating crash agent...
+   INFO:cephadm:Verifying we can ping mon IP 192.168.1.101...
+   INFO:cephadm:Pulling latest ceph/daemon-base:latest-master-devel container...
+   INFO:cephadm:Extracting ceph user uid/gid from container image...
+   INFO:cephadm:Creating initial keys...
+   INFO:cephadm:Creating initial monmap...
+   INFO:cephadm:Creating mon...
+   INFO:cephadm:Waiting for mon to start...
+   INFO:cephadm:Assimilating anything we can from ceph.conf...
+   INFO:cephadm:Generating new minimal ceph.conf...
+   INFO:cephadm:Restarting the monitor...
+   INFO:cephadm:Creating mgr...
+   INFO:cephadm:Creating crash agent...
    Created symlink /etc/systemd/system/ceph-335b6dac-064c-11ea-8243-48f17fe53909.target.wants/
    ceph-335b6dac-064c-11ea-8243-48f17fe53909-crash.service → /etc/systemd/system/ceph-335b6dac-
    064c-11ea-8243-48f17fe53909-crash.service.
-   INFO:ceph-daemon:Wrote keyring to ceph.keyring
-   INFO:ceph-daemon:Wrote config to ceph.conf
-   INFO:ceph-daemon:Waiting for mgr to start...
-   INFO:ceph-daemon:mgr is still not available yet, waiting...
-   INFO:ceph-daemon:mgr is still not available yet, waiting...
-   INFO:ceph-daemon:Generating ssh key...
-   INFO:ceph-daemon:Wrote public SSH key to to ceph.pub
-   INFO:ceph-daemon:Adding key to root@localhost's authorized_keys...
-   INFO:ceph-daemon:Enabling ssh module...
-   INFO:ceph-daemon:Setting orchestrator backend to ssh...
-   INFO:ceph-daemon:Adding host 192-168-1-101.tpgi.com.au...
-   INFO:ceph-daemon:Enabling the dashboard module...
-   INFO:ceph-daemon:Waiting for the module to be available...
-   INFO:ceph-daemon:Generating a dashboard self-signed certificate...
-   INFO:ceph-daemon:Creating initial admin user...
-   INFO:ceph-daemon:Fetching dashboard port number...
-   INFO:ceph-daemon:Ceph Dashboard is now available at:
+   INFO:cephadm:Wrote keyring to ceph.keyring
+   INFO:cephadm:Wrote config to ceph.conf
+   INFO:cephadm:Waiting for mgr to start...
+   INFO:cephadm:mgr is still not available yet, waiting...
+   INFO:cephadm:mgr is still not available yet, waiting...
+   INFO:cephadm:Generating ssh key...
+   INFO:cephadm:Wrote public SSH key to to ceph.pub
+   INFO:cephadm:Adding key to root@localhost's authorized_keys...
+   INFO:cephadm:Enabling ssh module...
+   INFO:cephadm:Setting orchestrator backend to ssh...
+   INFO:cephadm:Adding host 192-168-1-101.tpgi.com.au...
+   INFO:cephadm:Enabling the dashboard module...
+   INFO:cephadm:Waiting for the module to be available...
+   INFO:cephadm:Generating a dashboard self-signed certificate...
+   INFO:cephadm:Creating initial admin user...
+   INFO:cephadm:Fetching dashboard port number...
+   INFO:cephadm:Ceph Dashboard is now available at:
    URL: https://192-168-1-101.tpgi.com.au:8443/
    User: admin
    Password: oflamlrtna
-   INFO:ceph-daemon:You can access the Ceph CLI with:
-   sudo ./ceph-daemon shell -c ceph.conf -k ceph.keyring
-   INFO:ceph-daemon:Bootstrap complete.
+   INFO:cephadm:You can access the Ceph CLI with:
+   sudo ./cephadm shell -c ceph.conf -k ceph.keyring
+   INFO:cephadm:Bootstrap complete.
 
 
 Second Node
@@ -96,7 +97,7 @@ Second Node
 
    $ sudo apt install docker.io
 
-#. Turn on ssh on node 2:::
+3. Turn on ssh on node 2::
 
     $ sudo systemctl start sshd
     $ sudo systemctl enable sshd
@@ -121,7 +122,7 @@ Third Node
 
    $ sudo apt install docker.io
 
-#. Turn on ssh on node 3::
+3. Turn on ssh on node 3::
 
     $ sudo systemctl start sshd
     $ sudo systemctl enable sshd