aboutsummaryrefslogtreecommitdiffstats
path: root/docs/installconfigure
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installconfigure')
-rw-r--r--docs/installconfigure/Configure_git_and_gerrit.rst6
-rw-r--r--docs/installconfigure/Install_Configure_SO.rst20
-rw-r--r--docs/installconfigure/Install_Docker.rst6
3 files changed, 18 insertions, 14 deletions
diff --git a/docs/installconfigure/Configure_git_and_gerrit.rst b/docs/installconfigure/Configure_git_and_gerrit.rst
index c4598faf7b..76a4d75331 100644
--- a/docs/installconfigure/Configure_git_and_gerrit.rst
+++ b/docs/installconfigure/Configure_git_and_gerrit.rst
@@ -25,14 +25,14 @@ Enter your SSH public key (id_rsa) into gerrit:
- Log in
- Open the menu next to your name (under the green search button)
-.. image:: images/Configure_git_1.png
+.. image:: ../images/Configure_git_1.png
- Select "Settings"
- In the "Settings" sidebar, click "SSH Public Keys"`
- Click "Add Key..."
- Paste the entire contents of $HOME/.ssh/id_rsa.pub into the text area and click "Add".
-.. image:: images/Configure_git_2.png
+.. image:: ../images/Configure_git_2.png
Install the git-review package.
@@ -90,4 +90,4 @@ Verify that you have connectivity to gerrit through the proxy. Answer "yes" to
ssh -p 29418 gerrit.onap.org
-.. image:: images/Configure_git_3.png
+.. image:: ../images/Configure_git_3.png
diff --git a/docs/installconfigure/Install_Configure_SO.rst b/docs/installconfigure/Install_Configure_SO.rst
index bdfd328fc5..1ac01cc782 100644
--- a/docs/installconfigure/Install_Configure_SO.rst
+++ b/docs/installconfigure/Install_Configure_SO.rst
@@ -3,7 +3,7 @@
.. Copyright 2017 Huawei Technologies Co., Ltd.
SO Install & Configure
-==========================================
+======================
Get Ubuntu
----------
@@ -13,6 +13,7 @@ Get VirtualBox and VirtualBox Guest Additions
---------------------------------------------
Make sure you have the VirtualBox Guest Additions ISO for your version of VirtualBox. I'm using VirtualBox 5.1.28. Save the Guest Additions ISO on your host computer along with the Ubuntu ISO. Get the Guest Additions ISO from here:
http://download.virtualbox.org/virtualbox
+
*NOTE*: Guest Additions versions prior to 5.1 will not work with Ubuntu 16.04.3. If you have an earlier version of VirtualBox, you should upgrade to the latest 5.1 version.
Create a new VM in VirtualBox for Ubuntu
@@ -73,9 +74,11 @@ Read-only: <unchecked>
Install Ubuntu in the VM
------------------------
-On the "Storage" panel in VirtualBox, click on "[ optical drive ]" and then "Choose Disk Image". Select your Ubuntu ISO image.
+On the "Storage" panel in VirtualBox, click on "[ optical drive ]" and then "Choose Disk Image".
+
+Select your Ubuntu ISO image:
-.. image:: images/Configure_ubuntu_SO_5.png
+.. image:: ../images/Configure_ubuntu_SO_5.png
After selecting the ISO image, start the VM.
@@ -83,14 +86,15 @@ Follow the prompts to install Ubuntu.
Proxy Configuration (optional)
------------------------------
-If you're behind a corporate firewall, configure some proxy settings. NOTE: your proxy configuration may require username and password credentials, not shown here.
+If you're behind a corporate firewall, configure some proxy settings.
+NOTE: your proxy configuration may require username and password credentials, not shown here.
**Ubuntu system proxy setting:**
System Settings → Network → Network proxy
(Replace "proxyhost" and port with your actual proxy information)
-.. image:: images/Configure_ubuntu_SO_6.png
+.. image:: ../images/Configure_ubuntu_SO_6.png
**apt proxy setting:**
Edit /etc/apt/apt.conf and add one line at the top (replace "proxyhost:port" with your actual proxy information):
@@ -117,7 +121,7 @@ Install VirtualBox Guest Additions
----------------------------------
On the "Storage" panel in VirtualBox, click on "[ optical drive ]" and then "Choose Disk Image". Select your VirtualBox Guest Additions ISO image.
-.. image:: images/Configure_ubuntu_SO_8.png
+.. image:: ../images/Configure_ubuntu_SO_8.png
In a VM terminal window, mount the cdrom:
@@ -135,7 +139,7 @@ Install necessary dependencies:
Install the guest additions. NOTE: look for errors in the command output! If you see an error that says you are missing kernel headers, the most likely cause is that you are using a VirtualBox version that is too old. The error message is misleading.
-.. code-block:: bash
+ .. code-block:: bash
cd /media/cdrom
sudo ./VBoxLinuxAdditions.run
@@ -161,4 +165,4 @@ Further Reading
Install_Docker.rst
Configure_git_and_gerrit.rst
- Workspace_and_Development_Tools.rst \ No newline at end of file
+ Workspace_and_Development_Tools.rst
diff --git a/docs/installconfigure/Install_Docker.rst b/docs/installconfigure/Install_Docker.rst
index 91e40ca138..d20c2b1951 100644
--- a/docs/installconfigure/Install_Docker.rst
+++ b/docs/installconfigure/Install_Docker.rst
@@ -3,7 +3,7 @@
.. Copyright 2018 Huawei Technologies Co., Ltd.
Install Docker
-===============
+==============
Make sure curl is installed on the Ubuntu VM:
@@ -58,7 +58,7 @@ If you are behind a corporate firewall, you will need to configure proxy setting
Restart docker:
.. code-block:: bash
-
+
sudo systemctl daemon-reload
sudo systemctl restart docker
@@ -82,4 +82,4 @@ Verify that you can download and run the hello-world container
docker run hello-world
-.. image:: images/Docker_install_1.png \ No newline at end of file
+.. image:: ../images/Docker_install_1.png \ No newline at end of file