From 007cdf74bff97df129006be75f5fdd009cf33d4d Mon Sep 17 00:00:00 2001
From: Trevor Cooper <trevor.cooper@intel.com>
Date: Wed, 3 Jun 2015 15:58:39 +0000
Subject: Added link to infrastrcuture naming conventions Wiki page and other 
 minor edits

Change-Id: I4c4335e615b4adceffd929b9330acb7fbe8346d8
Signed-off-by: Trevor Cooper <trevor.cooper@intel.com>
---
 docs/pharos-spec.rst | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'docs/pharos-spec.rst')

diff --git a/docs/pharos-spec.rst b/docs/pharos-spec.rst
index 316eee6c..28a9770c 100644
--- a/docs/pharos-spec.rst
+++ b/docs/pharos-spec.rst
@@ -72,28 +72,25 @@ Power Supply Single
 
 Jump Server Installation
 
-* OS: CentOS 7
-* KVM / Qemu
-* Installer (Foreman, Fuel, ...) in a VM
-* Tools
+  * OS: CentOS 7
+  * KVM / Qemu
+  * Installer (Foreman, Fuel, ...) in a VM
+  * Tools
 
 See `Jump Server Installation <https://wiki.opnfv.org/jump_server_installation_guide>`_ for detailed Jump Server installation details.
 
-Test Tools
+Test Tools - See `functest <http://artifacts.opnfv.org/functest/docs/functest.html>`_
 
-Jump Server - `functest <http://artifacts.opnfv.org/functest/docs/functest.html>`_
+Controller nodes - these are bare metal servers
 
-Controller nodes - bare metal
+Compute nodes - these bare metal servers
 
-Compute nodes - bare metal
+**Infrastructure naming conventions / recommendations**
 
-**Security**
+The Pharos specificaiton provides recomendations for default logins and  naming conventions
 
-- Servers
-
-  - Default permissions
-  - Server Logins
-  - **Pharos team needs to provide consistent usernames for infrastructure**
+See `Infrastructure naming conventions <https://wiki.opnfv.org/pharos/pharos_naming>`_
+  
 
 Remote management
 ------------------
-- 
cgit 1.2.3-korg