75 files changed, 20 insertions, 13 deletions
diff --git a/docs/development/design/.keep b/docs/development/design/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/docs/development/design/.keep
diff --git a/docs/development/overview/.keep b/docs/development/overview/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/docs/development/overview/.keep
diff --git a/docs/development/requirement/.keep b/docs/development/requirement/.keep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/docs/development/requirement/.keep
diff --git a/docs/index.rst b/docs/index.rst
index 94844fa9..5777eede 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,14 +14,14 @@ OPNFV Community Lab Infrastructure
 ==================================
 
 .. toctree::
-   :maxdepth: 3
-   :numbered: 3
+   :maxdepth: 5
+   :numbered: 5
 
-   ./information/index.rst
-   ./specification/index.rst
-   ./lab-description/index.rst
-   ./configguide/index.rst
-   ./labs/index.rst
+   ./release/information/index.rst
+   ./release/release-notes/specification/index.rst
+   ./release/release-notes/lab-description/index.rst
+   ./release/configguide/index.rst
+   ./release/release-notes/labs/index.rst
 
 Indices
 =======
diff --git a/docs/configguide/configguide.rst b/docs/release/configguide/configguide.rst
index 29466776..29466776 100644
--- a/docs/configguide/configguide.rst
+++ b/docs/release/configguide/configguide.rst
diff --git a/docs/configguide/index.rst b/docs/release/configguide/index.rst
index c51f029b..c51f029b 100644
--- a/docs/configguide/index.rst
+++ b/docs/release/configguide/index.rst
diff --git a/docs/configguide/jumpserverinstall.rst b/docs/release/configguide/jumpserverinstall.rst
index e51e9469..e51e9469 100644
--- a/docs/configguide/jumpserverinstall.rst
+++ b/docs/release/configguide/jumpserverinstall.rst
diff --git a/docs/configguide/lab_update_guide.rst b/docs/release/configguide/lab_update_guide.rst
index c939164c..c939164c 100644
--- a/docs/configguide/lab_update_guide.rst
+++ b/docs/release/configguide/lab_update_guide.rst
diff --git a/docs/images/ZTE-POD.jpg b/docs/release/images/ZTE-POD.jpg
index 23907f9d..23907f9d 100644
--- a/docs/images/ZTE-POD.jpg
+++ b/docs/release/images/ZTE-POD.jpg
diff --git a/docs/images/bridge1.png b/docs/release/images/bridge1.png
index 9a557aef..9a557aef 100644
--- a/docs/images/bridge1.png
+++ b/docs/release/images/bridge1.png
diff --git a/docs/images/bridge2.png b/docs/release/images/bridge2.png
index 7d8c3831..7d8c3831 100644
--- a/docs/images/bridge2.png
+++ b/docs/release/images/bridge2.png
diff --git a/docs/images/opnfv-example-lab-diagram.png b/docs/release/images/opnfv-example-lab-diagram.png
index 5a3901cd..5a3901cd 100644
--- a/docs/images/opnfv-example-lab-diagram.png
+++ b/docs/release/images/opnfv-example-lab-diagram.png
diff --git a/docs/images/opnfv-pharos-diagram-v01.jpg b/docs/release/images/opnfv-pharos-diagram-v01.jpg
index b6886554..b6886554 100644
--- a/docs/images/opnfv-pharos-diagram-v01.jpg
+++ b/docs/release/images/opnfv-pharos-diagram-v01.jpg
diff --git a/docs/images/opnfv-test.jpg b/docs/release/images/opnfv-test.jpg
index 54a8110e..54a8110e 100644
--- a/docs/images/opnfv-test.jpg
+++ b/docs/release/images/opnfv-test.jpg
diff --git a/docs/images/pharos-archi1.jpg b/docs/release/images/pharos-archi1.jpg
index 3c4478a8..3c4478a8 100644
--- a/docs/images/pharos-archi1.jpg
+++ b/docs/release/images/pharos-archi1.jpg
diff --git a/docs/information/index.rst b/docs/release/information/index.rst
index 0311526a..0311526a 100644
--- a/docs/information/index.rst
+++ b/docs/release/information/index.rst
diff --git a/docs/information/pharos.rst b/docs/release/information/pharos.rst
index 1679e380..1679e380 100644
--- a/docs/information/pharos.rst
+++ b/docs/release/information/pharos.rst
diff --git a/docs/lab-description/images/lab_topology_example.jpg b/docs/release/release-notes/lab-description/images/lab_topology_example.jpg
index d151e9b5..d151e9b5 100644
--- a/docs/lab-description/images/lab_topology_example.jpg
+++ b/docs/release/release-notes/lab-description/images/lab_topology_example.jpg
diff --git a/docs/lab-description/images/pod_topology_example.png b/docs/release/release-notes/lab-description/images/pod_topology_example.png
index 11d09970..11d09970 100644
--- a/docs/lab-description/images/pod_topology_example.png
+++ b/docs/release/release-notes/lab-description/images/pod_topology_example.png
diff --git a/docs/lab-description/index.rst b/docs/release/release-notes/lab-description/index.rst
index 23b675ae..23b675ae 100644
--- a/docs/lab-description/index.rst
+++ b/docs/release/release-notes/lab-description/index.rst
diff --git a/docs/lab-description/inventory.rst b/docs/release/release-notes/lab-description/inventory.rst
index 81c0dd57..81c0dd57 100644
--- a/docs/lab-description/inventory.rst
+++ b/docs/release/release-notes/lab-description/inventory.rst
diff --git a/docs/lab-description/lab_description.rst b/docs/release/release-notes/lab-description/lab_description.rst
index d36e8c6f..d36e8c6f 100644
--- a/docs/lab-description/lab_description.rst
+++ b/docs/release/release-notes/lab-description/lab_description.rst
diff --git a/docs/lab-description/pod_description.rst b/docs/release/release-notes/lab-description/pod_description.rst
index 856d5c22..856d5c22 100644
--- a/docs/lab-description/pod_description.rst
+++ b/docs/release/release-notes/lab-description/pod_description.rst
diff --git a/docs/labs/Dell.rst b/docs/release/release-notes/labs/Dell.rst
index d93eb5d2..d93eb5d2 100644
--- a/docs/labs/Dell.rst
+++ b/docs/release/release-notes/labs/Dell.rst
diff --git a/docs/labs/ericsson/images/ericsson-opnfv-topology.png b/docs/release/release-notes/labs/ericsson/images/ericsson-opnfv-topology.png
index b3c86d3e..b3c86d3e 100644
--- a/docs/labs/ericsson/images/ericsson-opnfv-topology.png
+++ b/docs/release/release-notes/labs/ericsson/images/ericsson-opnfv-topology.png
diff --git a/docs/labs/ericsson/index.rst b/docs/release/release-notes/labs/ericsson/index.rst
index 1a19bf75..1a19bf75 100644
--- a/docs/labs/ericsson/index.rst
+++ b/docs/release/release-notes/labs/ericsson/index.rst
diff --git a/docs/labs/ericsson/lab_description.rst b/docs/release/release-notes/labs/ericsson/lab_description.rst
index b4c5b856..b4c5b856 100644
--- a/docs/labs/ericsson/lab_description.rst
+++ b/docs/release/release-notes/labs/ericsson/lab_description.rst
diff --git a/docs/labs/huawei-us-lab/huawei-lab-pod.png b/docs/release/release-notes/labs/huawei-us-lab/huawei-lab-pod.png
index cfb51c9c..cfb51c9c 100644
--- a/docs/labs/huawei-us-lab/huawei-lab-pod.png
+++ b/docs/release/release-notes/labs/huawei-us-lab/huawei-lab-pod.png
diff --git a/docs/labs/huawei-us-lab/huawei-lab-topology.png b/docs/release/release-notes/labs/huawei-us-lab/huawei-lab-topology.png
index 681a10c5..681a10c5 100644
--- a/docs/labs/huawei-us-lab/huawei-lab-topology.png
+++ b/docs/release/release-notes/labs/huawei-us-lab/huawei-lab-topology.png
diff --git a/docs/labs/huawei-us-lab/huawei-lab-virtual.png b/docs/release/release-notes/labs/huawei-us-lab/huawei-lab-virtual.png
index 46c818d4..46c818d4 100644
--- a/docs/labs/huawei-us-lab/huawei-lab-virtual.png
+++ b/docs/release/release-notes/labs/huawei-us-lab/huawei-lab-virtual.png
diff --git a/docs/labs/huawei-us-lab/index.rst b/docs/release/release-notes/labs/huawei-us-lab/index.rst
index 65241f29..65241f29 100644
--- a/docs/labs/huawei-us-lab/index.rst
+++ b/docs/release/release-notes/labs/huawei-us-lab/index.rst
diff --git a/docs/labs/huawei-us-lab/lab_specification.rst b/docs/release/release-notes/labs/huawei-us-lab/lab_specification.rst
index 99d2196f..99d2196f 100644
--- a/docs/labs/huawei-us-lab/lab_specification.rst
+++ b/docs/release/release-notes/labs/huawei-us-lab/lab_specification.rst
diff --git a/docs/labs/huawei-us-lab/net.png b/docs/release/release-notes/labs/huawei-us-lab/net.png
index 9a12c820..9a12c820 100644
--- a/docs/labs/huawei-us-lab/net.png
+++ b/docs/release/release-notes/labs/huawei-us-lab/net.png
diff --git a/docs/labs/huawei-us-lab/pod_specification.rst b/docs/release/release-notes/labs/huawei-us-lab/pod_specification.rst
index 53565158..53565158 100644
--- a/docs/labs/huawei-us-lab/pod_specification.rst
+++ b/docs/release/release-notes/labs/huawei-us-lab/pod_specification.rst
diff --git a/docs/labs/images/Dell_Overview.jpg b/docs/release/release-notes/labs/images/Dell_Overview.jpg
index 131765d0..131765d0 100644
--- a/docs/labs/images/Dell_Overview.jpg
+++ b/docs/release/release-notes/labs/images/Dell_Overview.jpg
diff --git a/docs/labs/images/Dell_POD1.jpg b/docs/release/release-notes/labs/images/Dell_POD1.jpg
index 9afe340b..9afe340b 100644
--- a/docs/labs/images/Dell_POD1.jpg
+++ b/docs/release/release-notes/labs/images/Dell_POD1.jpg
diff --git a/docs/labs/images/Dell_POD2.jpg b/docs/release/release-notes/labs/images/Dell_POD2.jpg
index 70d76e90..70d76e90 100644
--- a/docs/labs/images/Dell_POD2.jpg
+++ b/docs/release/release-notes/labs/images/Dell_POD2.jpg
diff --git a/docs/labs/images/Dell_POD3.jpg b/docs/release/release-notes/labs/images/Dell_POD3.jpg
index c85a22b6..c85a22b6 100644
--- a/docs/labs/images/Dell_POD3.jpg
+++ b/docs/release/release-notes/labs/images/Dell_POD3.jpg
diff --git a/docs/labs/images/orange_paris_pod1.jpg b/docs/release/release-notes/labs/images/orange_paris_pod1.jpg
index 8e6427f5..8e6427f5 100644
--- a/docs/labs/images/orange_paris_pod1.jpg
+++ b/docs/release/release-notes/labs/images/orange_paris_pod1.jpg
diff --git a/docs/labs/images/orange_pod2.png b/docs/release/release-notes/labs/images/orange_pod2.png
index 05693281..05693281 100644
--- a/docs/labs/images/orange_pod2.png
+++ b/docs/release/release-notes/labs/images/orange_pod2.png
diff --git a/docs/labs/images/spirent_vptc-public-drawing.png b/docs/release/release-notes/labs/images/spirent_vptc-public-drawing.png
index 174ac454..174ac454 100644
--- a/docs/labs/images/spirent_vptc-public-drawing.png
+++ b/docs/release/release-notes/labs/images/spirent_vptc-public-drawing.png
diff --git a/docs/labs/index.rst b/docs/release/release-notes/labs/index.rst
index 9c000f9d..9c000f9d 100755
--- a/docs/labs/index.rst
+++ b/docs/release/release-notes/labs/index.rst
diff --git a/docs/labs/ool/images/ool-testlab.png b/docs/release/release-notes/labs/ool/images/ool-testlab.png
index d0ac9352..d0ac9352 100644
--- a/docs/labs/ool/images/ool-testlab.png
+++ b/docs/release/release-notes/labs/ool/images/ool-testlab.png
diff --git a/docs/labs/ool/index.rst b/docs/release/release-notes/labs/ool/index.rst
index 0239e515..0239e515 100644
--- a/docs/labs/ool/index.rst
+++ b/docs/release/release-notes/labs/ool/index.rst
diff --git a/docs/labs/ool/inventory.rst b/docs/release/release-notes/labs/ool/inventory.rst
index 78368c4a..78368c4a 100644
--- a/docs/labs/ool/inventory.rst
+++ b/docs/release/release-notes/labs/ool/inventory.rst
diff --git a/docs/labs/ool/lab_description.rst b/docs/release/release-notes/labs/ool/lab_description.rst
index 72e2bd87..72e2bd87 100644
--- a/docs/labs/ool/lab_description.rst
+++ b/docs/release/release-notes/labs/ool/lab_description.rst
diff --git a/docs/labs/ool/pod1_description.rst b/docs/release/release-notes/labs/ool/pod1_description.rst
index 1640070a..1640070a 100644
--- a/docs/labs/ool/pod1_description.rst
+++ b/docs/release/release-notes/labs/ool/pod1_description.rst
diff --git a/docs/labs/ool/pod1_inventory.yaml b/docs/release/release-notes/labs/ool/pod1_inventory.yaml
index 528eb098..528eb098 100644
--- a/docs/labs/ool/pod1_inventory.yaml
+++ b/docs/release/release-notes/labs/ool/pod1_inventory.yaml
diff --git a/docs/labs/ool/virtual1_description.rst b/docs/release/release-notes/labs/ool/virtual1_description.rst
index 089bd925..089bd925 100644
--- a/docs/labs/ool/virtual1_description.rst
+++ b/docs/release/release-notes/labs/ool/virtual1_description.rst
diff --git a/docs/labs/orange-lannion-lab/index.rst b/docs/release/release-notes/labs/orange-lannion-lab/index.rst
index eeb25916..eeb25916 100644
--- a/docs/labs/orange-lannion-lab/index.rst
+++ b/docs/release/release-notes/labs/orange-lannion-lab/index.rst
diff --git a/docs/labs/orange-paris-lab/index.rst b/docs/release/release-notes/labs/orange-paris-lab/index.rst
index 4e8953bb..4e8953bb 100644
--- a/docs/labs/orange-paris-lab/index.rst
+++ b/docs/release/release-notes/labs/orange-paris-lab/index.rst
diff --git a/docs/labs/orange-paris-lab/orange_paris_lab_description.rst b/docs/release/release-notes/labs/orange-paris-lab/orange_paris_lab_description.rst
index 5a257316..5a257316 100644
--- a/docs/labs/orange-paris-lab/orange_paris_lab_description.rst
+++ b/docs/release/release-notes/labs/orange-paris-lab/orange_paris_lab_description.rst
diff --git a/docs/labs/orange-paris-lab/orange_paris_pod1_description.rst b/docs/release/release-notes/labs/orange-paris-lab/orange_paris_pod1_description.rst
index 75dcfdd5..75dcfdd5 100644
--- a/docs/labs/orange-paris-lab/orange_paris_pod1_description.rst
+++ b/docs/release/release-notes/labs/orange-paris-lab/orange_paris_pod1_description.rst
diff --git a/docs/labs/spirent.rst b/docs/release/release-notes/labs/spirent.rst
index 2c6a0cfb..2c6a0cfb 100644
--- a/docs/labs/spirent.rst
+++ b/docs/release/release-notes/labs/spirent.rst
diff --git a/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png b/docs/release/release-notes/labs/zte-sh-lab/images/zte_sh_lab_topology.png
index 6c147dbc..6c147dbc 100644
--- a/docs/labs/zte-sh-lab/images/zte_sh_lab_topology.png
+++ b/docs/release/release-notes/labs/zte-sh-lab/images/zte_sh_lab_topology.png
diff --git a/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png b/docs/release/release-notes/labs/zte-sh-lab/images/zte_sh_pod_topology.png
index 592b6077..592b6077 100644
--- a/docs/labs/zte-sh-lab/images/zte_sh_pod_topology.png
+++ b/docs/release/release-notes/labs/zte-sh-lab/images/zte_sh_pod_topology.png
diff --git a/docs/labs/zte-sh-lab/index.rst b/docs/release/release-notes/labs/zte-sh-lab/index.rst
index 9a8d7f56..9a8d7f56 100644
--- a/docs/labs/zte-sh-lab/index.rst
+++ b/docs/release/release-notes/labs/zte-sh-lab/index.rst
diff --git a/docs/labs/zte-sh-lab/lab_description.rst b/docs/release/release-notes/labs/zte-sh-lab/lab_description.rst
index 0d9d2dd0..0d9d2dd0 100644
--- a/docs/labs/zte-sh-lab/lab_description.rst
+++ b/docs/release/release-notes/labs/zte-sh-lab/lab_description.rst
diff --git a/docs/labs/zte-sh-lab/pod-1.rst b/docs/release/release-notes/labs/zte-sh-lab/pod-1.rst
index 7ec53a82..7ec53a82 100644
--- a/docs/labs/zte-sh-lab/pod-1.rst
+++ b/docs/release/release-notes/labs/zte-sh-lab/pod-1.rst
diff --git a/docs/labs/zte-sh-lab/pod-1.yaml b/docs/release/release-notes/labs/zte-sh-lab/pod-1.yaml
index b8bee5d8..b8bee5d8 100644
--- a/docs/labs/zte-sh-lab/pod-1.yaml
+++ b/docs/release/release-notes/labs/zte-sh-lab/pod-1.yaml
diff --git a/docs/labs/zte-sh-lab/pod-2.rst b/docs/release/release-notes/labs/zte-sh-lab/pod-2.rst
index 961aa2a0..961aa2a0 100644
--- a/docs/labs/zte-sh-lab/pod-2.rst
+++ b/docs/release/release-notes/labs/zte-sh-lab/pod-2.rst
diff --git a/docs/labs/zte-sh-lab/pod-2.yaml b/docs/release/release-notes/labs/zte-sh-lab/pod-2.yaml
index c56b53db..c56b53db 100644
--- a/docs/labs/zte-sh-lab/pod-2.yaml
+++ b/docs/release/release-notes/labs/zte-sh-lab/pod-2.yaml
diff --git a/docs/labs/zte-sh-lab/pod-3.rst b/docs/release/release-notes/labs/zte-sh-lab/pod-3.rst
index f0cfae7b..f0cfae7b 100644
--- a/docs/labs/zte-sh-lab/pod-3.rst
+++ b/docs/release/release-notes/labs/zte-sh-lab/pod-3.rst
diff --git a/docs/labs/zte-sh-lab/pod-3.yaml b/docs/release/release-notes/labs/zte-sh-lab/pod-3.yaml
index 409be27e..409be27e 100644
--- a/docs/labs/zte-sh-lab/pod-3.yaml
+++ b/docs/release/release-notes/labs/zte-sh-lab/pod-3.yaml
diff --git a/docs/platformoverview/labinfrastructure.rst b/docs/release/release-notes/platformoverview/labinfrastructure.rst
index 09c253d2..09c253d2 100644
--- a/docs/platformoverview/labinfrastructure.rst
+++ b/docs/release/release-notes/platformoverview/labinfrastructure.rst
diff --git a/docs/specification/hardwarespec.rst b/docs/release/release-notes/specification/hardwarespec.rst
index 8086aa91..8086aa91 100644
--- a/docs/specification/hardwarespec.rst
+++ b/docs/release/release-notes/specification/hardwarespec.rst
diff --git a/docs/specification/index.rst b/docs/release/release-notes/specification/index.rst
index c3eb45a7..c3eb45a7 100644
--- a/docs/specification/index.rst
+++ b/docs/release/release-notes/specification/index.rst
diff --git a/docs/specification/networkconfig.rst b/docs/release/release-notes/specification/networkconfig.rst
index fa95faa5..fb9d5111 100644
--- a/docs/specification/networkconfig.rst
+++ b/docs/release/release-notes/specification/networkconfig.rst
@@ -51,11 +51,11 @@ Documented configuration to include:
 
 **Sample Network Drawings**
 
-.. image:: ../images/bridge2.png
+.. image:: ../../images/bridge2.png
 
-.. image:: ../images/opnfv-pharos-diagram-v01.jpg
+.. image:: ../../images/opnfv-pharos-diagram-v01.jpg
 
-.. image:: ../images/opnfv-example-lab-diagram.png
+.. image:: ../../images/opnfv-example-lab-diagram.png
 
 Download the visio zip file here:
 `opnfv-example-lab-diagram.vsdx.zip
diff --git a/docs/specification/objectives.rst b/docs/release/release-notes/specification/objectives.rst
index 0a0ad6aa..0a0ad6aa 100644
--- a/docs/specification/objectives.rst
+++ b/docs/release/release-notes/specification/objectives.rst
diff --git a/docs/specification/remoteaccess.rst b/docs/release/release-notes/specification/remoteaccess.rst
index 4b8160ba..4b8160ba 100644
--- a/docs/specification/remoteaccess.rst
+++ b/docs/release/release-notes/specification/remoteaccess.rst
diff --git a/docs/how-to-use-docs/documentation-example.rst b/docs/release/userguide/documentation-example.rst
index ae0a7f23..ae0a7f23 100644
--- a/docs/how-to-use-docs/documentation-example.rst
+++ b/docs/release/userguide/documentation-example.rst
diff --git a/docs/how-to-use-docs/index.rst b/docs/release/userguide/index.rst
index 2fea43e0..bdd70ee8 100644
--- a/docs/how-to-use-docs/index.rst
+++ b/docs/release/userguide/index.rst
@@ -3,7 +3,7 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-.. image:: ../etc/opnfv-logo.png
+.. image:: ../../etc/opnfv-logo.png
   :height: 40
   :width: 200
   :alt: OPNFV
diff --git a/tools/pharos-dashboard/Makefile b/tools/pharos-dashboard/Makefile
index e52e15d2..90709171 100644
--- a/tools/pharos-dashboard/Makefile
+++ b/tools/pharos-dashboard/Makefile
@@ -10,6 +10,9 @@ start:
 stop:
 	docker-compose stop
 
+data:
+	docker volume create --name=pharos-data
+
 shell-nginx:
 	docker exec -ti ng01 bash
 
diff --git a/tools/pharos-dashboard/docker-compose.yml b/tools/pharos-dashboard/docker-compose.yml
index 16b8c0fd..44a263f0 100644
--- a/tools/pharos-dashboard/docker-compose.yml
+++ b/tools/pharos-dashboard/docker-compose.yml
@@ -50,7 +50,7 @@ services:
         env_file: config.env
         volumes:
             - ./config/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
-            - /var/lib/pharos_dashboard/postgresql:/var/lib/postgresql
+            - pharos-data:/var/lib/postgresql/data
 
     rabbitmq:
         restart: always
@@ -72,3 +72,6 @@ services:
             - rabbitmq
         volumes:
             - ./:/pharos_dashboard
+volumes:
+    pharos-data:
+        external: true
diff --git a/tools/pharos-dashboard/readme.txt b/tools/pharos-dashboard/readme.txt
index b21320f3..2a259129 100644
--- a/tools/pharos-dashboard/readme.txt
+++ b/tools/pharos-dashboard/readme.txt
@@ -18,6 +18,7 @@ Deployment:
 - install docker, docker-compose and bower
 - run 'bower install' in ./src/static/ to fetch javascript dependencies
 - run 'make build' to build the containers
+- run 'make data'
 - run 'make up' to run the dashboard
 
 Updating:
@@ -32,4 +33,4 @@ If there is migrations that need user input (like renaming a field), they need t
 
 Logs / Shell access:
 
-- there is some shortcuts in the makefile
-\ No newline at end of file
+- there is some shortcuts in the makefile