diff --git a/install-guide/source/install-base-config-common.inc b/install-guide/source/install-base-config-common.inc
index d0476326bb..8a6993fd7a 100644
--- a/install-guide/source/install-base-config-common.inc
+++ b/install-guide/source/install-base-config-common.inc
@@ -42,9 +42,30 @@
      Replace ``CEILOMETER_PASS`` with the password you chose for
      the ``ceilometer`` user in the Identity service.
 
-   * Create Ceilometer resources in Gnocchi. Gnocchi should be running by this
-     stage:
+3. Edit the ``/etc/gnocchi/gnocchi.conf`` file and add Keystone options:
 
-     .. code-block:: console
+   * In the ``[service_credentials]`` section, configure service credentials:
 
-        # ceilometer-upgrade --skip-metering-database
+     .. code-block:: ini
+
+        [service_credentials]
+        ...
+        auth_type = password
+        auth_url = http://controller:5000/v3
+        project_domain_id = default
+        user_domain_id = default
+        project_name = service
+        username = gnocchi
+        password = GNOCCHI_PASS
+        interface = internalURL
+        region_name = RegionOne
+
+     Replace ``GNOCCHI_PASS`` with the password you chose for
+     the ``gnocchi`` user in the Identity service.
+
+4. Create Ceilometer resources in Gnocchi. Gnocchi should be running by this
+   stage:
+
+   .. code-block:: console
+
+      # ceilometer-upgrade --skip-metering-database
diff --git a/install-guide/source/install-base-prereq-common.inc b/install-guide/source/install-base-prereq-common.inc
index 9424c380b5..debe072a21 100644
--- a/install-guide/source/install-base-prereq-common.inc
+++ b/install-guide/source/install-base-prereq-common.inc
@@ -48,3 +48,89 @@
         | name        | ceilometer                       |
         | type        | metering                         |
         +-------------+----------------------------------+
+
+3. Register Gnocchi service in Keystone:
+
+   * Create the ``gnocchi`` user:
+
+     .. code-block:: console
+
+        $ openstack user create --domain default --password-prompt gnocchi
+        User Password:
+        Repeat User Password:
+        +-----------+----------------------------------+
+        | Field     | Value                            |
+        +-----------+----------------------------------+
+        | domain_id | e0353a670a9e496da891347c589539e9 |
+        | enabled   | True                             |
+        | id        | 8bacd064f6434ef2b6bbfbedb79b0318 |
+        | name      | gnocchi                          |
+        +-----------+----------------------------------+
+
+   * Create the ``gnocchi`` service entity:
+
+     .. code-block:: console
+
+        $ openstack service create --name gnocchi \
+          --description "Metric Service" metric
+        +-------------+----------------------------------+
+        | Field       | Value                            |
+        +-------------+----------------------------------+
+        | description | Metric Service                   |
+        | enabled     | True                             |
+        | id          | 205978b411674e5a9990428f81d69384 |
+        | name        | gnocchi                          |
+        | type        | metric                           |
+        +-------------+----------------------------------+
+
+   * Create the Metric service API endpoints:
+
+     .. code-block:: console
+
+        $ openstack endpoint create --region RegionOne \
+          metric public http://controller:8041
+        +--------------+----------------------------------+
+        | Field        | Value                            |
+        +--------------+----------------------------------+
+        | enabled      | True                             |
+        | id           | b808b67b848d443e9eaaa5e5d796970c |
+        | interface    | public                           |
+        | region       | RegionOne                        |
+        | region_id    | RegionOne                        |
+        | service_id   | 205978b411674e5a9990428f81d69384 |
+        | service_name | gnocchi                          |
+        | service_type | metric                           |
+        | url          | http://controller:8041           |
+        +--------------+----------------------------------+
+
+        $ openstack endpoint create --region RegionOne \
+          metric internal http://controller:8041
+        +--------------+----------------------------------+
+        | Field        | Value                            |
+        +--------------+----------------------------------+
+        | enabled      | True                             |
+        | id           | c7009b1c2ee54b71b771fa3d0ae4f948 |
+        | interface    | internal                         |
+        | region       | RegionOne                        |
+        | region_id    | RegionOne                        |
+        | service_id   | 205978b411674e5a9990428f81d69384 |
+        | service_name | gnocchi                          |
+        | service_type | metric                           |
+        | url          | http://controller:8041           |
+        +--------------+----------------------------------+
+
+        $ openstack endpoint create --region RegionOne \
+          metric admin http://controller:8041
+        +--------------+----------------------------------+
+        | Field        | Value                            |
+        +--------------+----------------------------------+
+        | enabled      | True                             |
+        | id           | b2c00566d0604551b5fe1540c699db3d |
+        | interface    | admin                            |
+        | region       | RegionOne                        |
+        | region_id    | RegionOne                        |
+        | service_id   | 205978b411674e5a9990428f81d69384 |
+        | service_name | gnocchi                          |
+        | service_type | metric                           |
+        | url          | http://controller:8041           |
+        +--------------+----------------------------------+