From 312532299151313d57712302bf25bb9b592bd6e9 Mon Sep 17 00:00:00 2001 From: Brian Moss Date: Fri, 10 Feb 2017 17:08:57 +1000 Subject: [PATCH] [Install Guide] Update console text Update mysql prompts to Mariadb. Update 'openstack user create' output. Change-Id: Ie11c3fa3450d73243ccec0b82c2e100be80b1eb8 --- doc/install-guide/source/cinder-controller-install.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/install-guide/source/cinder-controller-install.rst b/doc/install-guide/source/cinder-controller-install.rst index 9bbe04b007..9b6e565b14 100644 --- a/doc/install-guide/source/cinder-controller-install.rst +++ b/doc/install-guide/source/cinder-controller-install.rst @@ -46,7 +46,7 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - mysql> CREATE DATABASE cinder; + MariaDB [(none)]> CREATE DATABASE cinder; .. end @@ -54,9 +54,9 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - mysql> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'localhost' \ + MariaDB [(none)]> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'localhost' \ IDENTIFIED BY 'CINDER_DBPASS'; - mysql> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'%' \ + MariaDB [(none)]> GRANT ALL PRIVILEGES ON cinder.* TO 'cinder'@'%' \ IDENTIFIED BY 'CINDER_DBPASS'; .. end @@ -89,12 +89,12 @@ must create a database, service credentials, and API endpoints. +---------------------+----------------------------------+ | domain_id | default | | enabled | True | - | id | 0dbcdd0968dd4c948eacf9eb60d82b46 | + | id | 9d7e33de3e1a498390353819bc7d245d | | name | cinder | + | options | {} | | password_expires_at | None | +---------------------+----------------------------------+ - .. end * Add the ``admin`` role to the ``cinder`` user: