diff --git a/doc/install-guide/source/environment-sql-database.rst b/doc/install-guide/source/environment-sql-database.rst index 29cdc5b631..820fe297ad 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 18a502d543..05e1ec1925 100644 --- a/doc/install-guide/source/glance-install.rst +++ b/doc/install-guide/source/glance-install.rst @@ -18,7 +18,7 @@ create a database, service credentials, and API endpoints. .. code-block:: console - $ mysql -u root -p + # mysql .. end @@ -50,7 +50,7 @@ create a database, service credentials, and API endpoints. .. code-block:: console - $ . admin-openrc + # . admin-openrc .. end @@ -60,7 +60,7 @@ create a database, service credentials, and API endpoints. .. code-block:: console - $ openstack user create --domain default --password-prompt glance + # openstack user create --domain default --password-prompt glance User Password: Repeat User Password: @@ -82,7 +82,7 @@ create a database, service credentials, and API endpoints. .. code-block:: console - $ openstack role add --project service --user glance admin + # openstack role add --project service --user glance admin .. end @@ -94,7 +94,7 @@ create a database, service credentials, and API endpoints. .. code-block:: console - $ openstack service create --name glance \ + # openstack service create --name glance \ --description "OpenStack Image" image +-------------+----------------------------------+ @@ -113,7 +113,7 @@ create a database, service credentials, and API endpoints. .. code-block:: console - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ image public http://controller:9292 +--------------+----------------------------------+ @@ -130,7 +130,7 @@ create a database, service credentials, and API endpoints. | url | http://controller:9292 | +--------------+----------------------------------+ - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ image internal http://controller:9292 +--------------+----------------------------------+ @@ -147,7 +147,7 @@ create a database, service credentials, and API endpoints. | url | http://controller:9292 | +--------------+----------------------------------+ - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ image admin http://controller:9292 +--------------+----------------------------------+ diff --git a/doc/install-guide/source/keystone-install.rst b/doc/install-guide/source/keystone-install.rst index 5c47e7a571..fdd0662f34 100644 --- a/doc/install-guide/source/keystone-install.rst +++ b/doc/install-guide/source/keystone-install.rst @@ -21,7 +21,7 @@ database and an administration token. .. code-block:: console - $ mysql -u root -p + # mysql .. end @@ -334,13 +334,13 @@ Finalize the installation .. code-block:: console - $ export OS_USERNAME=admin - $ export OS_PASSWORD=ADMIN_PASS - $ export OS_PROJECT_NAME=admin - $ export OS_USER_DOMAIN_NAME=Default - $ export OS_PROJECT_DOMAIN_NAME=Default - $ export OS_AUTH_URL=http://controller:35357/v3 - $ export OS_IDENTITY_API_VERSION=3 + # export OS_USERNAME=admin + # export OS_PASSWORD=ADMIN_PASS + # export OS_PROJECT_NAME=admin + # export OS_USER_DOMAIN_NAME=Default + # export OS_PROJECT_DOMAIN_NAME=Default + # export OS_AUTH_URL=http://controller:35357/v3 + # export OS_IDENTITY_API_VERSION=3 .. end diff --git a/doc/install-guide/source/neutron-controller-install.rst b/doc/install-guide/source/neutron-controller-install.rst index 9c62d8fde2..7a819d3274 100644 --- a/doc/install-guide/source/neutron-controller-install.rst +++ b/doc/install-guide/source/neutron-controller-install.rst @@ -14,7 +14,7 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - $ mysql -u root -p + # mysql .. end @@ -45,7 +45,7 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - $ . admin-openrc + # . admin-openrc .. end @@ -55,7 +55,7 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - $ openstack user create --domain default --password-prompt neutron + # openstack user create --domain default --password-prompt neutron User Password: Repeat User Password: @@ -75,7 +75,7 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - $ openstack role add --project service --user neutron admin + # openstack role add --project service --user neutron admin .. end @@ -87,7 +87,7 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - $ openstack service create --name neutron \ + # openstack service create --name neutron \ --description "OpenStack Networking" network +-------------+----------------------------------+ @@ -106,7 +106,7 @@ must create a database, service credentials, and API endpoints. .. code-block:: console - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ network public http://controller:9696 +--------------+----------------------------------+ @@ -123,7 +123,7 @@ must create a database, service credentials, and API endpoints. | url | http://controller:9696 | +--------------+----------------------------------+ - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ network internal http://controller:9696 +--------------+----------------------------------+ @@ -140,7 +140,7 @@ must create a database, service credentials, and API endpoints. | url | http://controller:9696 | +--------------+----------------------------------+ - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ network admin http://controller:9696 +--------------+----------------------------------+ diff --git a/doc/install-guide/source/nova-controller-install.rst b/doc/install-guide/source/nova-controller-install.rst index 00391e08b3..816c3226e7 100644 --- a/doc/install-guide/source/nova-controller-install.rst +++ b/doc/install-guide/source/nova-controller-install.rst @@ -17,7 +17,7 @@ create databases, service credentials, and API endpoints. .. code-block:: console - $ mysql -u root -p + # mysql .. end @@ -54,7 +54,7 @@ create databases, service credentials, and API endpoints. .. code-block:: console - $ . admin-openrc + # . admin-openrc .. end @@ -64,7 +64,7 @@ create databases, service credentials, and API endpoints. .. code-block:: console - $ openstack user create --domain default \ + # openstack user create --domain default \ --password-prompt nova User Password: @@ -85,7 +85,7 @@ create databases, service credentials, and API endpoints. .. code-block:: console - $ openstack role add --project service --user nova admin + # openstack role add --project service --user nova admin .. end @@ -97,7 +97,7 @@ create databases, service credentials, and API endpoints. .. code-block:: console - $ openstack service create --name nova \ + # openstack service create --name nova \ --description "OpenStack Compute" compute +-------------+----------------------------------+ @@ -116,7 +116,7 @@ create databases, service credentials, and API endpoints. .. code-block:: console - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ compute public http://controller:8774/v2.1/%\(tenant_id\)s +--------------+-------------------------------------------+ @@ -133,7 +133,7 @@ create databases, service credentials, and API endpoints. | url | http://controller:8774/v2.1/%(tenant_id)s | +--------------+-------------------------------------------+ - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ compute internal http://controller:8774/v2.1/%\(tenant_id\)s +--------------+-------------------------------------------+ @@ -150,7 +150,7 @@ create databases, service credentials, and API endpoints. | url | http://controller:8774/v2.1/%(tenant_id)s | +--------------+-------------------------------------------+ - $ openstack endpoint create --region RegionOne \ + # openstack endpoint create --region RegionOne \ compute admin http://controller:8774/v2.1/%\(tenant_id\)s +--------------+-------------------------------------------+