Merge "[install] Fix Ceilometer Debian install"

This commit is contained in:
Jenkins 2015-12-03 00:27:39 +00:00 committed by Gerrit Code Review
commit b9dba16e6d

View File

@ -15,7 +15,7 @@ unlike other services, the Telemetry service uses a NoSQL database.
See :ref:`environment-nosql-database` to install and configure See :ref:`environment-nosql-database` to install and configure
MongoDB before proceeding further. MongoDB before proceeding further.
.. only:: obs or ubuntu .. only:: obs or ubuntu or debian
1. Create the ``ceilometer`` database: 1. Create the ``ceilometer`` database:
@ -110,7 +110,7 @@ MongoDB before proceeding further.
| type | metering | | type | metering |
+-------------+----------------------------------+ +-------------+----------------------------------+
6. Create the Telemetry service API endpoints: 4. Create the Telemetry service API endpoints:
.. code-block:: console .. code-block:: console
@ -189,7 +189,7 @@ Install and configure components
openstack-ceilometer-central openstack-ceilometer-alarm \ openstack-ceilometer-central openstack-ceilometer-alarm \
python-ceilometerclient python-ceilometerclient
.. only:: ubuntu .. only:: ubuntu or debian
#. Install the packages: #. Install the packages:
@ -200,6 +200,13 @@ Install and configure components
ceilometer-alarm-evaluator ceilometer-alarm-notifier \ ceilometer-alarm-evaluator ceilometer-alarm-notifier \
python-ceilometerclient python-ceilometerclient
.. only:: debian
Respond to prompts for
:doc:`Identity service credentials <debconf/debconf-keystone-authtoken>`,
:doc:`service endpoint registration <debconf/debconf-api-endpoints>`,
and :doc:`message broker credentials <debconf/debconf-rabbitmq>`.
2. Edit the ``/etc/ceilometer/ceilometer.conf`` file and complete 2. Edit the ``/etc/ceilometer/ceilometer.conf`` file and complete
the following actions: the following actions:
@ -216,6 +223,8 @@ Install and configure components
as ':', '/', '+', and '@' in the connection string in accordance as ':', '/', '+', and '@' in the connection string in accordance
with RFC2396. with RFC2396.
.. only:: obs or rdo or ubuntu
* In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections, * In the ``[DEFAULT]`` and ``[oslo_messaging_rabbit]`` sections,
configure ``RabbitMQ`` message queue access: configure ``RabbitMQ`` message queue access:
@ -335,7 +344,7 @@ Finalize installation
openstack-ceilometer-alarm-evaluator.service \ openstack-ceilometer-alarm-evaluator.service \
openstack-ceilometer-alarm-notifier.service openstack-ceilometer-alarm-notifier.service
.. only:: ubuntu .. only:: ubuntu or debian
* Restart the Telemetry services: * Restart the Telemetry services: