openstack/openstack-manuals
Code Issues Proposed changes

Merge "Remove usage of openstack-db"

Browse Source
This commit is contained in:
Jenkins 2014-04-15 13:07:02 +00:00 committed by Gerrit Code Review
commit 253809affb
5 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/install-guide/section_cinder-controller.xml
View File

@ -42,13 +42,7 @@ connection = mysql://cinder:<replaceable>CINDER_DBPASS</replaceable>@<replaceabl
<literal>[database]</literal> section header. You must add this
section header to the end of the file before you proceed.</para>
</note></step>
<step os="rhel;centos;fedora;opensuse;sles">
<para>To create the Block Storage service database and tables
and a <literal>cinder</literal> database user, run the
<command>openstack-db</command> command.</para>
<screen><prompt>#</prompt> <userinput>openstack-db --init --service cinder --password <replaceable>CINDER_DBPASS</replaceable></userinput></screen>
</step>
<step os="ubuntu">
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Use the password that you set to log in as root to create
a <literal>cinder</literal> database:</para>
<screen><prompt>#</prompt> <userinput>mysql -u root -p</userinput></screen>
@ -56,7 +50,7 @@ connection = mysql://cinder:<replaceable>CINDER_DBPASS</replaceable>@<replaceabl
<screen><prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'localhost' IDENTIFIED BY '<replaceable>CINDER_DBPASS</replaceable>';</userinput></screen>
<screen><prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'%' IDENTIFIED BY '<replaceable>CINDER_DBPASS</replaceable>';</userinput></screen>
</step>
<step os="ubuntu">
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Create the database tables for the Block Storage
service:</para>
<screen><prompt>#</prompt> <userinput>cinder-manage db sync</userinput></screen>

11
doc/install-guide/section_glance-install.xml
View File

@ -106,13 +106,6 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
rabbit_password <replaceable>RABBIT_PASS</replaceable></userinput></screen>
</step>
<step os="rhel;centos;fedora;opensuse;sles">
<para>Use the <command>openstack-db</command> command to create
the Image Service database and tables and a
<literal>glance</literal> database user:</para>
<screen><prompt>#</prompt> <userinput>openstack-db --init --service glance --password <replaceable>GLANCE_DBPASS</replaceable></userinput></screen>
</step>
<step os="ubuntu">
<para>By default, the Ubuntu packages create an SQLite database.
Delete the <filename>glance.sqlite</filename> file created in
@ -120,7 +113,7 @@ rabbit_password = <replaceable>RABBIT_PASS</replaceable></programlisting>
does not get used by mistake:</para>
<screen><prompt>#</prompt> <userinput>rm /var/lib/glance/glance.sqlite</userinput></screen>
</step>
<step os="ubuntu">
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Use the password you created to log in as root and create
a <literal>glance</literal> database user:</para>
<screen><prompt>$</prompt> <userinput>mysql -u root -p</userinput>
@ -130,7 +123,7 @@ IDENTIFIED BY '<replaceable>GLANCE_DBPASS</replaceable>';</userinput>
<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' \
IDENTIFIED BY '<replaceable>GLANCE_DBPASS</replaceable>';</userinput></screen>
</step>
<step os="ubuntu">
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Create the database tables for the Image Service:</para>
<screen><prompt>#</prompt> <userinput>glance-manage db_sync</userinput></screen>
</step>

13
doc/install-guide/section_keystone-install.xml
View File

@ -40,15 +40,6 @@ connection = mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replac
</programlisting>
</step>
<step os="rhel;centos;fedora;opensuse;sles">
<para>Use the <command>openstack-db</command> command to create
the database and tables, as well as a database user called
<literal>keystone</literal> to connect to the database.
Replace
<literal><replaceable>KEYSTONE_DBPASS</replaceable></literal>
with the same password used in the previous step.</para>
<screen><prompt>#</prompt> <userinput>openstack-db --init --service keystone --password <replaceable>KEYSTONE_DBPASS</replaceable></userinput></screen>
</step>
<step os="ubuntu">
<para>By default, the Ubuntu packages create a SQLite database.
Delete the <filename>keystone.db</filename> file created in
@ -56,7 +47,7 @@ connection = mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replac
does not get used by mistake:</para>
<screen><prompt>#</prompt> <userinput>rm /var/lib/keystone/keystone.db</userinput></screen>
</step>
<step os="ubuntu">
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Use the password that you set previously to log in as
root. Create a <literal>keystone</literal> database
user:</para>
@ -68,7 +59,7 @@ connection = mysql://keystone:<replaceable>KEYSTONE_DBPASS</replaceable>@<replac
IDENTIFIED BY '<replaceable>KEYSTONE_DBPASS</replaceable>';</userinput>
<prompt>mysql></prompt> <userinput>exit</userinput></screen>
</step>
<step os="ubuntu">
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Create the database tables for the Identity Service:</para>
<screen><prompt>#</prompt> <userinput>keystone-manage db_sync</userinput></screen>
</step>

1
doc/install-guide/section_neutron-ovs-controller-node.xml
View File

@ -31,7 +31,6 @@
node, follow the instructions in this guide to set up OpenStack
Networking nodes.</para>
<step os="rhel;centos;fedora;opensuse;sles;ubuntu">
<!-- TODO(sross): change this to use `openstack-db` once it supports Neutron -->
<para>Connect to the MySQL database as the root user, create the
<literal>neutron</literal> database, and grant the proper
access to it:</para>

10
doc/install-guide/section_nova-controller.xml
View File

@ -102,12 +102,6 @@ vncserver_listen = 10.0.0.11
vncserver_proxyclient_address = 10.0.0.11</programlisting>
</step>
<step os="fedora;rhel;centos;opensuse;sles">
<para>Run the <command>openstack-db</command> command to create
the Compute service database and tables and a
<literal>nova</literal> database user.</para>
<screen os="fedora;rhel;centos;opensuse;sles"><prompt>#</prompt> <userinput>openstack-db --init --service nova --password <replaceable>NOVA_DBPASS</replaceable></userinput></screen>
</step>
<step os="ubuntu">
<para>By default, the Ubuntu packages create an SQLite database.
Delete the <filename>nova.sqlite</filename> file created in
@ -115,7 +109,7 @@ vncserver_proxyclient_address = 10.0.0.11</programlisting>
does not get used by mistake:</para>
<screen><prompt>#</prompt> <userinput>rm /var/lib/nova/nova.sqlite</userinput></screen>
</step>
<step os="ubuntu">
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Use the password you created previously to log in as root.
Create a <literal>nova</literal> database user:</para>
<screen><prompt>$</prompt> <userinput>mysql -u root -p</userinput>
@ -125,7 +119,7 @@ IDENTIFIED BY '<replaceable>NOVA_DBPASS</replaceable>';</userinput>
<prompt>mysql></prompt> <userinput>GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'%' \
IDENTIFIED BY '<replaceable>NOVA_DBPASS</replaceable>';</userinput></screen>
</step>
<step os="ubuntu">
<step os="ubuntu;rhel;centos;fedora;opensuse;sles">
<para>Create the Compute service tables:</para>
<screen><prompt>#</prompt> <userinput>nova-manage db sync</userinput></screen>
</step>