From 6ec65a3f45a1b51274b4048bd8785a4626644e48 Mon Sep 17 00:00:00 2001 From: chenxing Date: Sat, 7 Jan 2017 14:33:56 +0000 Subject: [PATCH] [install] Fixes change to unix_socket authentication This is an Ubuntu only change. Ubuntu now uses the unix_socket authentication plugin. Corrects the way users authenticate to the mariadb server. Change-Id: I4642b40487f4f272be93a71cf259c3c100ea3c3c Closes-Bug: #1654663 Closes-Bug: #1647848 --- .../source/cinder-controller-install.rst | 27 +++++++++++++++---- .../source/environment-sql-database.rst | 13 +++++++++ doc/install-guide/source/glance-install.rst | 27 +++++++++++++++---- doc/install-guide/source/keystone-install.rst | 27 +++++++++++++++---- .../source/neutron-controller-install.rst | 27 +++++++++++++++---- .../source/nova-controller-install.rst | 27 +++++++++++++++---- 6 files changed, 123 insertions(+), 25 deletions(-) diff --git a/doc/install-guide/source/cinder-controller-install.rst b/doc/install-guide/source/cinder-controller-install.rst index 394a7a91f7..9bbe04b007 100644 --- a/doc/install-guide/source/cinder-controller-install.rst +++ b/doc/install-guide/source/cinder-controller-install.rst @@ -16,14 +16,31 @@ must create a database, service credentials, and API endpoints. #. To create the database, complete these steps: - * Use the database access client to connect to the database - server as the ``root`` user: + .. only:: ubuntu - .. code-block:: console + * Use the database access client to connect to the database + server as the ``root`` user: - $ mysql -u root -p + .. code-block:: console - .. end + # mysql + + .. end + + .. endonly + + .. only:: rdo or debian or obs + + * Use the database access client to connect to the database + server as the ``root`` user: + + .. code-block:: console + + $ mysql -u root -p + + .. end + + .. endonly * Create the ``cinder`` database: diff --git a/doc/install-guide/source/environment-sql-database.rst b/doc/install-guide/source/environment-sql-database.rst index 25c51f0a36..b30e0fec30 100644 --- a/doc/install-guide/source/environment-sql-database.rst +++ b/doc/install-guide/source/environment-sql-database.rst @@ -7,6 +7,19 @@ guide use MariaDB or MySQL depending on the distribution. OpenStack services also support other SQL databases including `PostgreSQL `__. +.. only:: ubuntu + + .. note:: + + As of Ubuntu 15.10, MariaDB was changed to use + the "unix_socket Authentication Plugin". Local authentication is + now preformed using the user credentials (UID) and password + authentication is no longer used by default. This means that + the root user no longer uses a password for local access to + the server. + +.. endonly + Install and configure components -------------------------------- diff --git a/doc/install-guide/source/glance-install.rst b/doc/install-guide/source/glance-install.rst index ea6fd5cea4..199c185a02 100644 --- a/doc/install-guide/source/glance-install.rst +++ b/doc/install-guide/source/glance-install.rst @@ -13,14 +13,31 @@ create a database, service credentials, and API endpoints. #. To create the database, complete these steps: - * Use the database access client to connect to the database - server as the ``root`` user: + .. only:: ubuntu - .. code-block:: console + * Use the database access client to connect to the database + server as the ``root`` user: - $ mysql -u root -p + .. code-block:: console - .. end + # mysql + + .. end + + .. endonly + + .. only:: rdo or debian or obs + + * Use the database access client to connect to the database + server as the ``root`` user: + + .. code-block:: console + + $ mysql -u root -p + + .. end + + .. endonly * Create the ``glance`` database: diff --git a/doc/install-guide/source/keystone-install.rst b/doc/install-guide/source/keystone-install.rst index 20bc98f33d..4a1277365a 100644 --- a/doc/install-guide/source/keystone-install.rst +++ b/doc/install-guide/source/keystone-install.rst @@ -16,14 +16,31 @@ database and an administration token. #. To create the database, complete the following actions: - * Use the database access client to connect to the database server as the - ``root`` user: + .. only:: ubuntu - .. code-block:: console + * Use the database access client to connect to the database + server as the ``root`` user: - $ mysql -u root -p + .. code-block:: console - .. end + # mysql + + .. end + + .. endonly + + .. only:: rdo or debian or obs + + * Use the database access client to connect to the database + server as the ``root`` user: + + .. code-block:: console + + $ mysql -u root -p + + .. end + + .. endonly * Create the ``keystone`` database: diff --git a/doc/install-guide/source/neutron-controller-install.rst b/doc/install-guide/source/neutron-controller-install.rst index d49eff5821..d5ac3887a7 100644 --- a/doc/install-guide/source/neutron-controller-install.rst +++ b/doc/install-guide/source/neutron-controller-install.rst @@ -9,14 +9,31 @@ must create a database, service credentials, and API endpoints. #. To create the database, complete these steps: - * Use the database access client to connect to the database server as the - ``root`` user: + .. only:: ubuntu - .. code-block:: console + * Use the database access client to connect to the database + server as the ``root`` user: - $ mysql -u root -p + .. code-block:: console - .. end + # mysql + + .. end + + .. endonly + + .. only:: rdo or debian or obs + + * Use the database access client to connect to the database + server as the ``root`` user: + + .. code-block:: console + + $ mysql -u root -p + + .. end + + .. endonly * Create the ``neutron`` database: diff --git a/doc/install-guide/source/nova-controller-install.rst b/doc/install-guide/source/nova-controller-install.rst index c2c4ff2aca..942196ebfe 100644 --- a/doc/install-guide/source/nova-controller-install.rst +++ b/doc/install-guide/source/nova-controller-install.rst @@ -12,14 +12,31 @@ create databases, service credentials, and API endpoints. #. To create the databases, complete these steps: - * Use the database access client to connect to - the database server as the ``root`` user: + .. only:: ubuntu - .. code-block:: console + * Use the database access client to connect to the database + server as the ``root`` user: - $ mysql -u root -p + .. code-block:: console - .. end + # mysql + + .. end + + .. endonly + + .. only:: rdo or debian or obs + + * Use the database access client to connect to the database + server as the ``root`` user: + + .. code-block:: console + + $ mysql -u root -p + + .. end + + .. endonly * Create the ``nova_api`` and ``nova`` databases: