Fix indent in docs

Change-Id: Ic83980366fda6ce82e04a3c45777092ef14bae5f
This commit is contained in:
David Rabel 2017-10-28 16:31:45 +02:00
parent 249ec84f2e
commit 84af1645ac
2 changed files with 49 additions and 49 deletions

View File

@ -4,21 +4,21 @@
Install and configure the Trove dashboard Install and configure the Trove dashboard
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Installation of the Trove dashboard for Horizon is straightforward. * Installation of the Trove dashboard for Horizon is straightforward.
It is best to install it via pip. It is best to install it via pip.
.. code-block:: console .. code-block:: console
# pip install trove-dashboard # pip install trove-dashboard
* The command above will install the latest version which is * The command above will install the latest version which is
appropriate if you are running the latest Trove. If you are appropriate if you are running the latest Trove. If you are
running an earlier version of Trove you may need to specify running an earlier version of Trove you may need to specify
a compatible version of trove-dashboard. a compatible version of trove-dashboard.
* After pip installs it, locate the trove-dashboard directory and * After pip installs it, locate the trove-dashboard directory and
copy the contents of the ``enabled/`` directory to your horizon copy the contents of the ``enabled/`` directory to your horizon
``openstack_dashboard/local/enabled/`` directory. ``openstack_dashboard/local/enabled/`` directory.
* Reload Apache to pick up the changes to Horizon. * Reload Apache to pick up the changes to Horizon.

View File

@ -12,34 +12,34 @@ an existing OpenStack environment for development purposes.
This document will not cover: This document will not cover:
- OpenStack setup - OpenStack setup
- Trove service configuration - Trove service configuration
Requirements Requirements
============ ============
A running OpenStack environment is required, including the following components: A running OpenStack environment is required, including the following components:
- Compute (Nova) - Compute (Nova)
- Image Service (Glance) - Image Service (Glance)
- Identity (Keystone) - Identity (Keystone)
- A networking component (either Neutron or Nova-Network) - A networking component (either Neutron or Nova-Network)
- If you want to provision datastores on block-storage volumes, you also will need Block Storage (Cinder) - If you want to provision datastores on block-storage volumes, you also will need Block Storage (Cinder)
- If you want to do backup/restore and replication, you will also need Object Storage (Swift) - If you want to do backup/restore and replication, you will also need Object Storage (Swift)
- An environment with a freshly installed Ubuntu 14.04 LTS to run Trove services. - An environment with a freshly installed Ubuntu 14.04 LTS to run Trove services.
This will be referred to as "local environment" This will be referred to as "local environment"
- AMQP service (RabbitMQ or QPID) - AMQP service (RabbitMQ or QPID)
- MySQL (SQLite, PostgreSQL) database for Trove's internal needs, accessible from the local environment - MySQL (SQLite, PostgreSQL) database for Trove's internal needs, accessible from the local environment
- Certain OpenStack services must be accessible from VMs: - Certain OpenStack services must be accessible from VMs:
- Swift - Swift
- VMs must be accessible from local environment for development/debugging purposes - VMs must be accessible from local environment for development/debugging purposes
- OpenStack services must be accessible directly from the local environment, such as: - OpenStack services must be accessible directly from the local environment, such as:
- Nova - Nova
- Cinder - Cinder
- Swift - Swift
- Heat - Heat
Installation Installation
============ ============
@ -50,14 +50,14 @@ Gather info
The following information about the existing environment is required: The following information about the existing environment is required:
- Keystone host and port(s) - Keystone host and port(s)
- OpenStack administrator's username, tenant name and password - OpenStack administrator's username, tenant name and password
- Nova URL - Nova URL
- Cinder URL - Cinder URL
- Swift URL - Swift URL
- Heat URL - Heat URL
- AMQP connection credentials (server URL, user, password) - AMQP connection credentials (server URL, user, password)
- Trove's controller backend connection string (MySQL, SQLite, PostgreSQL) - Trove's controller backend connection string (MySQL, SQLite, PostgreSQL)
-------------------- --------------------
Install dependencies Install dependencies
@ -190,11 +190,11 @@ Prepare Trove configuration files
There are several configuration files for Trove: There are several configuration files for Trove:
- api-paste.ini and trove.conf — For trove-api service - api-paste.ini and trove.conf — For trove-api service
- trove-taskmanager.conf — For trove-taskmanager service - trove-taskmanager.conf — For trove-taskmanager service
- trove-guestagent.conf — For trove-guestagent service - trove-guestagent.conf — For trove-guestagent service
- trove-conductor.conf — For trove-conductor service - trove-conductor.conf — For trove-conductor service
- <datastore_manager>.cloudinit — Userdata for VMs during provisioning - <datastore_manager>.cloudinit — Userdata for VMs during provisioning
Cloud-init scripts are userdata that is being used for different datastore types like mysql/percona, cassandra, mongodb, redis, couchbase while provisioning new compute instances. Cloud-init scripts are userdata that is being used for different datastore types like mysql/percona, cassandra, mongodb, redis, couchbase while provisioning new compute instances.
@ -242,7 +242,7 @@ Cloud-init content
Each cloud-init script for Trove-compatible images should contain: Each cloud-init script for Trove-compatible images should contain:
- Trove installation - Trove installation
Custom images with Trove code inside Custom images with Trove code inside
==================================== ====================================
@ -254,9 +254,9 @@ Prepare the database
Create the Trove database schema: Create the Trove database schema:
- Connect to the storage backend (MySQL, PostgreSQL) - Connect to the storage backend (MySQL, PostgreSQL)
- Create a database called `trove` (this database will be used for storing Trove ORM) - Create a database called `trove` (this database will be used for storing Trove ORM)
- Compose connection string. Example: mysql+pymysql://<user>:<password>@<backend_host>:<backend_port>/<database_name> - Compose connection string. Example: mysql+pymysql://<user>:<password>@<backend_host>:<backend_port>/<database_name>
Initialize the database Initialize the database
======================= =======================