From 2c6be4db1dccfb8fca93ad08030f0f1cc1c8e605 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 15 Apr 2014 09:43:23 +0200 Subject: [PATCH] Remove usage of openstack-db Create database manually instead of using openstack-db, it caused too much trouble. Change-Id: I1086eab85b6c26dc0ecac3e1d91f2ad1851c1404 Related-Bug: #1307189 --- doc/install-guide/section_cinder-controller.xml | 10 ++-------- doc/install-guide/section_glance-install.xml | 11 ++--------- doc/install-guide/section_keystone-install.xml | 13 ++----------- .../section_neutron-ovs-controller-node.xml | 1 - doc/install-guide/section_nova-controller.xml | 10 ++-------- 5 files changed, 8 insertions(+), 37 deletions(-) diff --git a/doc/install-guide/section_cinder-controller.xml b/doc/install-guide/section_cinder-controller.xml index bcd0cecc92..c72d2ff051 100644 --- a/doc/install-guide/section_cinder-controller.xml +++ b/doc/install-guide/section_cinder-controller.xml @@ -42,13 +42,7 @@ connection = mysql://cinder:CINDER_DBPASS@[database] section header. You must add this section header to the end of the file before you proceed. - - To create the Block Storage service database and tables - and a cinder database user, run the - openstack-db command. - # openstack-db --init --service cinder --password CINDER_DBPASS - - + Use the password that you set to log in as root to create a cinder database: # mysql -u root -p @@ -56,7 +50,7 @@ connection = mysql://cinder:CINDER_DBPASS@mysql> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'localhost' IDENTIFIED BY 'CINDER_DBPASS'; mysql> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'%' IDENTIFIED BY 'CINDER_DBPASS'; - + Create the database tables for the Block Storage service: # cinder-manage db sync diff --git a/doc/install-guide/section_glance-install.xml b/doc/install-guide/section_glance-install.xml index df85734067..680158a326 100644 --- a/doc/install-guide/section_glance-install.xml +++ b/doc/install-guide/section_glance-install.xml @@ -106,13 +106,6 @@ rabbit_password = RABBIT_PASS rabbit_password RABBIT_PASS - - - Use the openstack-db command to create - the Image Service database and tables and a - glance database user: - # openstack-db --init --service glance --password GLANCE_DBPASS - By default, the Ubuntu packages create an SQLite database. Delete the glance.sqlite file created in @@ -120,7 +113,7 @@ rabbit_password = RABBIT_PASS does not get used by mistake: # rm /var/lib/glance/glance.sqlite - + Use the password you created to log in as root and create a glance database user: $ mysql -u root -p @@ -130,7 +123,7 @@ IDENTIFIED BY 'GLANCE_DBPASS'; mysql> GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' \ IDENTIFIED BY 'GLANCE_DBPASS'; - + Create the database tables for the Image Service: # glance-manage db_sync diff --git a/doc/install-guide/section_keystone-install.xml b/doc/install-guide/section_keystone-install.xml index e1d2a0a4fb..39465faccd 100644 --- a/doc/install-guide/section_keystone-install.xml +++ b/doc/install-guide/section_keystone-install.xml @@ -40,15 +40,6 @@ connection = mysql://keystone:KEYSTONE_DBPASS@ - - Use the openstack-db command to create - the database and tables, as well as a database user called - keystone to connect to the database. - Replace - KEYSTONE_DBPASS - with the same password used in the previous step. - # openstack-db --init --service keystone --password KEYSTONE_DBPASS - By default, the Ubuntu packages create a SQLite database. Delete the keystone.db file created in @@ -56,7 +47,7 @@ connection = mysql://keystone:KEYSTONE_DBPASS@ # rm /var/lib/keystone/keystone.db - + Use the password that you set previously to log in as root. Create a keystone database user: @@ -68,7 +59,7 @@ connection = mysql://keystone:KEYSTONE_DBPASS@KEYSTONE_DBPASS'; mysql> exit - + Create the database tables for the Identity Service: # keystone-manage db_sync diff --git a/doc/install-guide/section_neutron-ovs-controller-node.xml b/doc/install-guide/section_neutron-ovs-controller-node.xml index cf8900b1a9..bf03bd01b8 100644 --- a/doc/install-guide/section_neutron-ovs-controller-node.xml +++ b/doc/install-guide/section_neutron-ovs-controller-node.xml @@ -31,7 +31,6 @@ node, follow the instructions in this guide to set up OpenStack Networking nodes. - Connect to the MySQL database as the root user, create the neutron database, and grant the proper access to it: diff --git a/doc/install-guide/section_nova-controller.xml b/doc/install-guide/section_nova-controller.xml index c224059fd5..17f3f8df25 100644 --- a/doc/install-guide/section_nova-controller.xml +++ b/doc/install-guide/section_nova-controller.xml @@ -102,12 +102,6 @@ vncserver_listen = 10.0.0.11 vncserver_proxyclient_address = 10.0.0.11 - - Run the openstack-db command to create - the Compute service database and tables and a - nova database user. - # openstack-db --init --service nova --password NOVA_DBPASS - By default, the Ubuntu packages create an SQLite database. Delete the nova.sqlite file created in @@ -115,7 +109,7 @@ vncserver_proxyclient_address = 10.0.0.11 does not get used by mistake: # rm /var/lib/nova/nova.sqlite - + Use the password you created previously to log in as root. Create a nova database user: $ mysql -u root -p @@ -125,7 +119,7 @@ IDENTIFIED BY 'NOVA_DBPASS'; mysql> GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'%' \ IDENTIFIED BY 'NOVA_DBPASS'; - + Create the Compute service tables: # nova-manage db sync