From 7ae814c06d4e3859ecb6add03e3172798d807702 Mon Sep 17 00:00:00 2001 From: phil-hopkins-a Date: Wed, 4 Jan 2017 07:45:55 -0600 Subject: [PATCH] Fixes prompt for MariaDB Since the actual MySQL server is now MariaDB, the command line prompt has changed. This now shows the correct MariaDB prompt when creating the keystone, glance, neutron and nova databases. Change-Id: I8bc19370ecc309ac47701aebd184c34d1baf381e Closes-Bug: 1648783 --- doc/install-guide/source/glance-install.rst | 6 +++--- doc/install-guide/source/keystone-install.rst | 6 +++--- .../source/neutron-controller-install.rst | 6 +++--- doc/install-guide/source/nova-controller-install.rst | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/install-guide/source/glance-install.rst b/doc/install-guide/source/glance-install.rst index 18a502d543..56a8f31c69 100644 --- a/doc/install-guide/source/glance-install.rst +++ b/doc/install-guide/source/glance-install.rst @@ -26,7 +26,7 @@ create a database, service credentials, and API endpoints. .. code-block:: console - mysql> CREATE DATABASE glance; + MariaDB [(none)] CREATE DATABASE glance; .. end @@ -34,9 +34,9 @@ create a database, service credentials, and API endpoints. .. code-block:: console - mysql> GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' \ IDENTIFIED BY 'GLANCE_DBPASS'; - mysql> GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' \ IDENTIFIED BY 'GLANCE_DBPASS'; .. end diff --git a/doc/install-guide/source/keystone-install.rst b/doc/install-guide/source/keystone-install.rst index 5c47e7a571..381495f475 100644 --- a/doc/install-guide/source/keystone-install.rst +++ b/doc/install-guide/source/keystone-install.rst @@ -29,7 +29,7 @@ database and an administration token. .. code-block:: console - mysql> CREATE DATABASE keystone; + MariaDB [(none)] CREATE DATABASE keystone; .. end @@ -37,9 +37,9 @@ database and an administration token. .. code-block:: console - mysql> GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' \ IDENTIFIED BY 'KEYSTONE_DBPASS'; - mysql> GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' \ IDENTIFIED BY 'KEYSTONE_DBPASS'; .. end diff --git a/doc/install-guide/source/neutron-controller-install.rst b/doc/install-guide/source/neutron-controller-install.rst index 9c62d8fde2..93068b94cf 100644 --- a/doc/install-guide/source/neutron-controller-install.rst +++ b/doc/install-guide/source/neutron-controller-install.rst @@ -22,7 +22,7 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - mysql> CREATE DATABASE neutron; + MariaDB [(none)] CREATE DATABASE neutron; .. end @@ -31,9 +31,9 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - mysql> GRANT ALL PRIVILEGES ON neutron.* TO 'neutron'@'localhost' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON neutron.* TO 'neutron'@'localhost' \ IDENTIFIED BY 'NEUTRON_DBPASS'; - mysql> GRANT ALL PRIVILEGES ON neutron.* TO 'neutron'@'%' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON neutron.* TO 'neutron'@'%' \ IDENTIFIED BY 'NEUTRON_DBPASS'; .. end diff --git a/doc/install-guide/source/nova-controller-install.rst b/doc/install-guide/source/nova-controller-install.rst index 00391e08b3..ec57143062 100644 --- a/doc/install-guide/source/nova-controller-install.rst +++ b/doc/install-guide/source/nova-controller-install.rst @@ -25,8 +25,8 @@ create databases, service credentials, and API endpoints. .. code-block:: console - mysql> CREATE DATABASE nova_api; - mysql> CREATE DATABASE nova; + MariaDB [(none)] CREATE DATABASE nova_api; + MariaDB [(none)] CREATE DATABASE nova; .. end @@ -34,13 +34,13 @@ create databases, service credentials, and API endpoints. .. code-block:: console - mysql> GRANT ALL PRIVILEGES ON nova_api.* TO 'nova'@'localhost' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON nova_api.* TO 'nova'@'localhost' \ IDENTIFIED BY 'NOVA_DBPASS'; - mysql> GRANT ALL PRIVILEGES ON nova_api.* TO 'nova'@'%' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON nova_api.* TO 'nova'@'%' \ IDENTIFIED BY 'NOVA_DBPASS'; - mysql> GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'localhost' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'localhost' \ IDENTIFIED BY 'NOVA_DBPASS'; - mysql> GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'%' \ + MariaDB [(none)] GRANT ALL PRIVILEGES ON nova.* TO 'nova'@'%' \ IDENTIFIED BY 'NOVA_DBPASS'; .. end