Reorganize directory structure

Currently for both upstream-training and training-guide directory
slides are stored in the subdirectories of landing web pages.
It is not easy to capture the directory structure and this requires
Sphinx conf file to have unnecessary excluded entries.

This commits reorganizes each directory to the following structure.
It follows the convention in the documentation project.

doc/upstream-training:

(previous)
  +-- README.rst
  +-- website RST files
  +-- conf.py (for website)
  +-- build/
  +-- source/
       +-- slide RST files
       +-- conf.py (for slides)
       +-- _assets/
       +-- _static/
       +-- locale/

(new)
  +-- README.rst
  +-- build/
  +-- source/
       +-- website/
       |    +-- website RST files
       |    +-- conf.py (for website)
       |    +-- _assets/
       +-- slides/
       |    +-- slide RST files
       |    +-- conf.py (for slides)
       |    +-- _assets/
       |    +-- _static/
       +-- locales/

training-guide directory is reorganized similarly.
training-guide _assets/README has been removed as it is used.

Also updates tox.ini to share target command definitions.
We do not need to have same things in many places.

Note that this commit does not change the build document paths.

Change-Id: I5a21f170c06d8f71f1f2d0df354e6d6280cb29d0

doc/training-guides/_assets/README

@@ -1 +0,0 @@
-dummy file holding directory

doc/training-guides/source/slides/01-getting-started.rst

@@ -2,7 +2,7 @@
 Getting started
 ===============
 
-.. figure:: ../figures/os_background.png
+.. figure:: figures/os_background.png
    :class: fill
    :width: 100%
 
@@ -59,7 +59,7 @@ Release Cycle
 
   - Made of four major stages: Planning, Implementation, Pre-release, Release
 
-.. image:: ../figures/community-heartbeats.png
+.. image:: figures/community-heartbeats.png
 
 *Community Heartbeat*
 
@@ -111,7 +111,7 @@ Conceptual Architecture
 Conceptual Architecture (cont)
 ==============================
 
-.. image:: ../figures/conceptual-arch.jpg
+.. image:: figures/conceptual-arch.jpg
 
 *Conceptual Diagram*
 
@@ -139,7 +139,7 @@ Conceptual Architecture (cont)
 Logical Architecture
 ====================
 
-.. image:: ../figures/arch-havana-logical-v1.jpg
+.. image:: figures/arch-havana-logical-v1.jpg
 
 *Logical diagram*
 
@@ -166,7 +166,7 @@ Dashboard (horizon)
 - Provides an end user and administrator interface to OpenStack services.
 - A modular Django web application
 
-.. image:: ../figures/horizon-essex.jpg
+.. image:: figures/horizon-essex.jpg
   :width: 75%
 
 .. note::

doc/training-guides/source/slides/02-getting-started-quiz.rst

@@ -1,7 +1,7 @@
 Getting started quiz
 ====================
 
-.. image:: ../figures/os_background.png
+.. image:: figures/os_background.png
    :class: fill
    :width: 100%
 
@@ -56,7 +56,7 @@ Getting started quiz questions
 Answers
 =======
 
-.. image:: ../figures/os_background.png
+.. image:: figures/os_background.png
    :class: fill
    :width: 100%
 

doc/training-guides/source/slides/03-using-with-horizon.rst

@@ -2,7 +2,7 @@
 Using OpenStack Dashboard (Horizon)
 ===================================
 
-.. figure:: ../figures/os_background.png
+.. figure:: figures/os_background.png
    :class: fill
    :width: 100%
 
@@ -72,7 +72,7 @@ Dashboard - Overview
   - Top-level row shows the username that you logged in with
   - Also access Settings or Sign Out of the Web interface
 
-.. image:: ../figures/horizon-main-dashboard.png
+.. image:: figures/horizon-main-dashboard.png
 
 Dashboard - Project tab
 =======================
@@ -169,7 +169,7 @@ Add security group rules (cont)
   - The Dashboard shows the security groups that are available for this
     project.
 
-.. image:: ../figures/horizon-secgroup-list.png
+.. image:: figures/horizon-secgroup-list.png
 
 Add security group rules (cont)
 ===============================
@@ -177,7 +177,7 @@ Add security group rules (cont)
   - Select the default security group and click Edit Rules
   - The Security Group Rules page appears:
 
-.. image:: ../figures/horizon-secgroup-edit.png
+.. image:: figures/horizon-secgroup-edit.png
 
 Add keypairs
 ============
@@ -210,14 +210,14 @@ OpenStack Dashboard - Instances
   - Launch an instance from a volume
   - Create instance snapshots
 
-.. image:: ../figures/horizon-instances.png
+.. image:: figures/horizon-instances.png
 
 OpenStack Dashboard - Actions
 =============================
 
 - Control the state of an instance
 
-.. image:: ../figures/horizon-actions.png
+.. image:: figures/horizon-actions.png
 
 OpenStack Dashboard - Track Usage
 =================================
@@ -225,7 +225,7 @@ OpenStack Dashboard - Track Usage
 - Use the Dashboard's Overview category to track usage of instances for each
   project.
 
-.. image:: ../figures/horizon-main-dashboard.png
+.. image:: figures/horizon-main-dashboard.png
 
 OpenStack Dashboard - Track Usage (cont)
 ========================================

doc/training-guides/source/slides/04-using-with-cli.rst

@@ -2,7 +2,7 @@
 Using OpenStack Command-Line Interface
 ======================================
 
-.. figure:: ../figures/os_background.png
+.. figure:: figures/os_background.png
    :class: fill
    :width: 100%
 

doc/training-guides/source/slides/06-compute-node-quiz.rst

@@ -1,7 +1,7 @@
 Compute node quiz
 =================
 
-.. image:: ../figures/os_background.png
+.. image:: figures/os_background.png
    :class: fill
    :width: 100%
 
@@ -65,7 +65,7 @@ Compute node quiz questions
 Answers
 =======
 
-.. image:: ../figures/os_background.png
+.. image:: figures/os_background.png
    :class: fill
    :width: 100%
 

doc/training-guides/source/slides/07-associate-network-node.rst

@@ -2,7 +2,7 @@
 Network node
 ============
 
-.. figure:: ../figures/os_background.png
+.. figure:: figures/os_background.png
    :class: fill
    :width: 100%
 
@@ -145,7 +145,7 @@ Typically at least **four** distinct **physical** data center **networks**:
 OpenStack Networking - Connectivity
 ===================================
 
-.. image:: ../figures/network-connectivity.png
+.. image:: figures/network-connectivity.png
 
 
 OpenStack Networking Concepts
@@ -175,7 +175,7 @@ OpenStack Networking Concepts (cont)
 OpenStack Networking Concepts (cont)
 ====================================
 
-.. image:: ../figures/network-concept.png
+.. image:: figures/network-concept.png
 
 Managing Networks - CLI
 =======================

doc/training-guides/source/slides/compute-overview.rst

@@ -2,7 +2,7 @@
 Compute (Nova)
 ==============
 
-.. figure:: ../figures/os_background.png
+.. figure:: figures/os_background.png
    :class: fill
    :width: 100%
 

doc/training-guides/source/slides/conf.py

@@ -40,7 +40,7 @@ extensions = [
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['../_templates']
+# templates_path = ['_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -76,7 +76,7 @@ release = '2015.5.01'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['build']
+exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -136,7 +136,7 @@ html_theme = 'default'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['../_static']
+html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

doc/training-guides/source/slides/slide-index.rst

@@ -2,7 +2,7 @@
 OpenStack Training Guides - Associate Guide
 ===========================================
 
-.. figure:: ../figures/os_background.png
+.. figure:: figures/os_background.png
    :class: fill
    :width: 100%
 

doc/training-guides/source/website/conf.py

@@ -84,7 +84,7 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['associate-guide', 'build']
+exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -281,4 +281,4 @@ texinfo_documents = [
 # texinfo_no_detailmenu = False
 
 # -- Options for Internationalization output ------------------------------
-locale_dirs = ['source/locale/']
+locale_dirs = ['../locale/']