diff --git a/doc/install-guide/source/basics-packages.rst b/doc/install-guide/source/basics-packages.rst index e8956f47cb..68afb228c9 100644 --- a/doc/install-guide/source/basics-packages.rst +++ b/doc/install-guide/source/basics-packages.rst @@ -238,19 +238,19 @@ services also support other SQL databases including .. code-block:: console - # apt-get install mariadb-server python-mysqldb + # apt-get install mariadb-server python-pymysql .. only:: debian .. code-block:: console - # apt-get install mysql-server python-mysqldb + # apt-get install mysql-server python-pymysql .. only:: rdo .. code-block:: console - # yum install mariadb mariadb-server MySQL-python + # yum install mariadb mariadb-server PyMySQL .. only:: obs diff --git a/doc/install-guide/source/cinder-controller-node.rst b/doc/install-guide/source/cinder-controller-node.rst index c66ad1ad22..0674ce8fd2 100644 --- a/doc/install-guide/source/cinder-controller-node.rst +++ b/doc/install-guide/source/cinder-controller-node.rst @@ -211,7 +211,7 @@ To install and configure Block Storage controller components [database] ... - connection = mysql://cinder:CINDER_DBPASS@controller/cinder + connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder Replace ``CINDER_DBPASS`` with the password you chose for the Block Storage database. diff --git a/doc/install-guide/source/cinder-storage-node.rst b/doc/install-guide/source/cinder-storage-node.rst index f7e0397fb7..e1c800382d 100644 --- a/doc/install-guide/source/cinder-storage-node.rst +++ b/doc/install-guide/source/cinder-storage-node.rst @@ -191,7 +191,7 @@ Install and configure Block Storage volume components .. code-block:: console # yum install openstack-cinder targetcli python-oslo-db \ - python-oslo-log MySQL-python + python-oslo-log PyMySQL .. Temporary workaround for bug: https://bugzilla.redhat.com/show_bug.cgi?id=1212899 @@ -213,7 +213,7 @@ Install and configure Block Storage volume components [database] ... - connection = mysql://cinder:CINDER_DBPASS@controller/cinder + connection = mysql+pymysql://cinder:CINDER_DBPASS@controller/cinder Replace ``CINDER_DBPASS`` with the password you chose for the Block Storage database. diff --git a/doc/install-guide/source/debconf/debconf-dbconfig-common.rst b/doc/install-guide/source/debconf/debconf-dbconfig-common.rst index 153fdd14a4..47555ae122 100644 --- a/doc/install-guide/source/debconf/debconf-dbconfig-common.rst +++ b/doc/install-guide/source/debconf/debconf-dbconfig-common.rst @@ -11,7 +11,7 @@ directive as follows: .. code-block:: ini [database] - connection = mysql://keystone:0dec658e3f14a7d@localhost/keystonedb + connection = mysql+pymysql://keystone:0dec658e3f14a7d@localhost/keystonedb This ``connection`` directive will be handled by the ``dbconfig-common`` package, which provides a standard Debian interface. It enables you to @@ -80,7 +80,7 @@ corresponding DNS will then be: .. code-block:: ini [database] - connection = mysql://keystone:PASSWORD@localhost/keystonedb + connection = mysql+pymysql://keystone:PASSWORD@localhost/keystonedb The ``dbconfig-common`` package will configure MySQL for these access rights, and create the database for you. Since OpenStack 2014.1.1, all diff --git a/doc/install-guide/source/glance-install.rst b/doc/install-guide/source/glance-install.rst index 01d71e137c..77e8e337b3 100644 --- a/doc/install-guide/source/glance-install.rst +++ b/doc/install-guide/source/glance-install.rst @@ -180,7 +180,7 @@ To install and configure the Image service components [database] ... - connection = mysql://glance:GLANCE_DBPASS@controller/glance + connection = mysql+pymysql://glance:GLANCE_DBPASS@controller/glance Replace ``GLANCE_DBPASS`` with the password you chose for the Image service database. @@ -259,7 +259,7 @@ To install and configure the Image service components [database] ... - connection = mysql://glance:GLANCE_DBPASS@controller/glance + connection = mysql+pymysql://glance:GLANCE_DBPASS@controller/glance Replace ``GLANCE_DBPASS`` with the password you chose for the Image service database. diff --git a/doc/install-guide/source/heat-install.rst b/doc/install-guide/source/heat-install.rst index aabfe3d08c..41e4b59974 100644 --- a/doc/install-guide/source/heat-install.rst +++ b/doc/install-guide/source/heat-install.rst @@ -248,7 +248,7 @@ To install and configure the Orchestration components [database] ... - connection = mysql://heat:HEAT_DBPASS@controller/heat + connection = mysql+pymysql://heat:HEAT_DBPASS@controller/heat Replace ``HEAT_DBPASS`` with the password you chose for the Orchestration database. diff --git a/doc/install-guide/source/keystone-install.rst b/doc/install-guide/source/keystone-install.rst index c38d757e63..91d1827758 100644 --- a/doc/install-guide/source/keystone-install.rst +++ b/doc/install-guide/source/keystone-install.rst @@ -138,7 +138,7 @@ database and an administration token. [database] ... - connection = mysql://keystone:KEYSTONE_DBPASS@controller/keystone + connection = mysql+pymysql://keystone:KEYSTONE_DBPASS@controller/keystone Replace ``KEYSTONE_DBPASS`` with the password you chose for the database. @@ -212,7 +212,7 @@ database and an administration token. [database] ... - connection = mysql://keystone:KEYSTONE_DBPASS@controller/keystone + connection = mysql+pymysql://keystone:KEYSTONE_DBPASS@controller/keystone If you decide to not use ``dbconfig-common``, then you will have to create the database and manage its access rights yourself, and run the diff --git a/doc/install-guide/source/neutron-controller-node.rst b/doc/install-guide/source/neutron-controller-node.rst index a5e45f1651..fe28e5885e 100644 --- a/doc/install-guide/source/neutron-controller-node.rst +++ b/doc/install-guide/source/neutron-controller-node.rst @@ -187,7 +187,7 @@ must create a database, service credentials, and API endpoint. [database] ... - connection = mysql://neutron:NEUTRON_DBPASS@controller/neutron + connection = mysql+pymysql://neutron:NEUTRON_DBPASS@controller/neutron Replace ``NEUTRON_DBPASS`` with the password you chose for the database. diff --git a/doc/install-guide/source/nova-controller-install.rst b/doc/install-guide/source/nova-controller-install.rst index 43268f59b9..76429b6d93 100644 --- a/doc/install-guide/source/nova-controller-install.rst +++ b/doc/install-guide/source/nova-controller-install.rst @@ -167,7 +167,7 @@ To install and configure Compute controller components [database] ... - connection = mysql://nova:NOVA_DBPASS@controller/nova + connection = mysql+pymysql://nova:NOVA_DBPASS@controller/nova Replace ``NOVA_DBPASS`` with the password you chose for the Compute database.