From 055ed3c27ec6de73e2e62818b29ecf99437ed0a0 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 23 Apr 2014 19:41:22 +0200 Subject: [PATCH] Install Guide: Trove edits Follow our conventions: * Wrap long lines in screens. * Use all-caps for variables. * Use # su instead of $ sudo su like in other chapters Change-Id: Iab395ada34583d24bc68db9c297a36b4432fbf20 --- doc/install-guide/section_trove-install.xml | 35 +++++++++++++-------- doc/install-guide/section_trove-verify.xml | 24 +++++++++----- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/doc/install-guide/section_trove-install.xml b/doc/install-guide/section_trove-install.xml index a8360e7dc8..d46a32d50b 100644 --- a/doc/install-guide/section_trove-install.xml +++ b/doc/install-guide/section_trove-install.xml @@ -39,7 +39,8 @@ service tenant and give the user the admin role: - $ keystone user-create --name=trove --pass=TROVE_PASS --email=trove@example.com + $ keystone user-create --name=trove --pass=TROVE_PASS \ + --email=trove@example.com $ keystone user-role-add --user=trove --tenant=service --role=admin @@ -79,10 +80,12 @@ notifier_queue_hostname = controller DEFAULT rpc_backend rabbit # openstack-config --set /etc/trove/trove-conductor.conf \ DEFAULT rpc_backend rabbit -# openstack-config --set /etc/trove/trove-api.conf DEFAULT qpid_hostname controller -# openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT qpid_hostname controller -# openstack-config --set /etc/trove/trove-conductor.conf DEFAULT qpid_hostname controller - +# openstack-config --set /etc/trove/trove-api.conf DEFAULT \ + qpid_hostname controller +# openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT \ + qpid_hostname controller +# openstack-config --set /etc/trove/trove-conductor.conf DEFAULT \ + qpid_hostname controller @@ -104,12 +107,18 @@ rabbit_password = RABBIT_PASS DEFAULT rpc_backend rabbit # openstack-config --set /etc/trove/trove-conductor.conf \ DEFAULT rpc_backend rabbit -# openstack-config --set /etc/trove/trove-api.conf DEFAULT rabbit_host controller -# openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT rabbit_host controller -# openstack-config --set /etc/trove/trove-conductor.conf DEFAULT rabbit_host controller -# openstack-config --set /etc/trove/trove-api.conf DEFAULT rabbit_password RABBIT_PASS -# openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT rabbit_password RABBIT_PASS -# openstack-config --set /etc/trove/trove-conductor.conf DEFAULT rabbit_password RABBIT_PASS +# openstack-config --set /etc/trove/trove-api.conf DEFAULT \ + rabbit_host controller +# openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT \ + rabbit_host controller +# openstack-config --set /etc/trove/trove-conductor.conf DEFAULT \ + rabbit_host controller +# openstack-config --set /etc/trove/trove-api.conf DEFAULT \ + rabbit_password RABBIT_PASS +# openstack-config --set /etc/trove/trove-taskmaster.conf DEFAULT \ + rabbit_password RABBIT_PASS +# openstack-config --set /etc/trove/trove-conductor.conf DEFAULT \ + rabbit_password RABBIT_PASS @@ -170,13 +179,13 @@ nova_proxy_admin_tenant_name = service Initialize the database: - $ sudo su -s /bin/sh -c "trove-manage db_sync" trove + # su -s /bin/sh -c "trove-manage db_sync" trove Create a datastore. You need to create a separate datastore for each type of database you want to use, for example, MySQL, MongoDB, Cassandra. This example shows you how to create a datastore for a MySQL database: - $ sudo su -s /bin/sh -c "trove-manage datastore_update mysql ''" trove + # su -s /bin/sh -c "trove-manage datastore_update mysql ''" trove diff --git a/doc/install-guide/section_trove-verify.xml b/doc/install-guide/section_trove-verify.xml index 0342b7f322..7db0b01ac3 100644 --- a/doc/install-guide/section_trove-verify.xml +++ b/doc/install-guide/section_trove-verify.xml @@ -3,8 +3,9 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> Verify the Database service installation - To verify that the Database service is installed and configured correctly, try executing a Trove command: - + To verify that the Database service is installed and + configured correctly, try executing a Trove command: + Source the demo-openrc.sh file. $ source ~/demo-openrc.sh @@ -19,11 +20,18 @@ +----+------+-----------+-------------------+--------+-----------+------+ - Assuming you have created an image for the type of database you want, and have updated the datastore to use that image, you can now create a Trove instance (database). To do this, use the trove create command. - This example shows you how to create a MySQL 5.5 database: - $ trove create name 2 --size=2 --databases=dbname \ - --users user:pass --datastore_version mysql-5.5 \ + + Assuming you have created an image for the type of + database you want, and have updated the datastore to + use that image, you can now create a Trove instance + (database). To do this, use the trove + create command. + + This example shows you how to create a MySQL 5.5 + database: + $ trove create name 2 --size=2 --databases=DBNAME \ + --users USER:PASSWORD --datastore_version mysql-5.5 \ --datastore mysql - - + +