summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-31 15:07:47 +0000
committerGerrit Code Review <review@openstack.org>2017-05-31 15:07:47 +0000
commit1d2d6106d2d01ac60fe3fdb1fe400bbbabda737d (patch)
tree9fcaf5a0b18bdb3f724bbd778463cba9e0e160fd
parentbcd066346d8f63ea1cbe0a3ae8cca79f4cb9b06f (diff)
parent61fb2e04abdd92994502f9a88db5ceb7c023af6d (diff)
Merge "add ceilometer storage disclaimer" into stable/newton
-rw-r--r--install-guide/source/install-base-obs.rst13
-rw-r--r--install-guide/source/install-base-rdo.rst13
-rw-r--r--install-guide/source/install-base-ubuntu.rst13
3 files changed, 39 insertions, 0 deletions
diff --git a/install-guide/source/install-base-obs.rst b/install-guide/source/install-base-obs.rst
index 22095dd..8ec78a3 100644
--- a/install-guide/source/install-base-obs.rst
+++ b/install-guide/source/install-base-obs.rst
@@ -9,6 +9,15 @@ Telemetry service, code-named ceilometer, on the controller node.
9Prerequisites 9Prerequisites
10------------- 10-------------
11 11
12.. warning::
13
14 Ceilometer's native storage has extremely large resource requirements. For
15 more efficient time-series storage, a time-series database such as Gnocchi_
16 is recommended. The following instructions are unsupported in future
17 releases.
18
19.. _Gnocchi: http://gnocchi.xyz/
20
12Before you install and configure the Telemetry service, you must 21Before you install and configure the Telemetry service, you must
13create a database, service credentials, and API endpoints. However, 22create a database, service credentials, and API endpoints. However,
14unlike other services, the Telemetry service uses a NoSQL database. 23unlike other services, the Telemetry service uses a NoSQL database.
@@ -65,6 +74,10 @@ Install and configure components
65Configure the Apache HTTP server 74Configure the Apache HTTP server
66-------------------------------- 75--------------------------------
67 76
77.. note::
78
79 The following is only required if Ceilometer's native storage is enabled.
80
68* Create the ``/etc/apache2/conf.d/wsgi-ceilometer.conf`` file 81* Create the ``/etc/apache2/conf.d/wsgi-ceilometer.conf`` file
69 with the following content: 82 with the following content:
70 83
diff --git a/install-guide/source/install-base-rdo.rst b/install-guide/source/install-base-rdo.rst
index f9a9504..b2b13d3 100644
--- a/install-guide/source/install-base-rdo.rst
+++ b/install-guide/source/install-base-rdo.rst
@@ -9,6 +9,15 @@ Telemetry service, code-named ceilometer, on the controller node.
9Prerequisites 9Prerequisites
10------------- 10-------------
11 11
12.. warning::
13
14 Ceilometer's native storage has extremely large resource requirements. For
15 more efficient time-series storage, a time-series database such as Gnocchi_
16 is recommended. The following instructions are unsupported in future
17 releases.
18
19.. _Gnocchi: http://gnocchi.xyz/
20
12Before you install and configure the Telemetry service, you must 21Before you install and configure the Telemetry service, you must
13create a database, service credentials, and API endpoints. However, 22create a database, service credentials, and API endpoints. However,
14unlike other services, the Telemetry service uses a NoSQL database. 23unlike other services, the Telemetry service uses a NoSQL database.
@@ -49,6 +58,10 @@ Install and configure components
49Configure the Apache HTTP server 58Configure the Apache HTTP server
50-------------------------------- 59--------------------------------
51 60
61.. note::
62
63 The following is only required if Ceilometer's native storage is enabled.
64
52* Create the ``/etc/httpd/conf.d/wsgi-ceilometer.conf`` file with 65* Create the ``/etc/httpd/conf.d/wsgi-ceilometer.conf`` file with
53 the following content: 66 the following content:
54 67
diff --git a/install-guide/source/install-base-ubuntu.rst b/install-guide/source/install-base-ubuntu.rst
index 36979c6..18eb419 100644
--- a/install-guide/source/install-base-ubuntu.rst
+++ b/install-guide/source/install-base-ubuntu.rst
@@ -9,6 +9,15 @@ Telemetry service, code-named ceilometer, on the controller node.
9Prerequisites 9Prerequisites
10------------- 10-------------
11 11
12.. warning::
13
14 Ceilometer's native storage has extremely large resource requirements. For
15 more efficient time-series storage, a time-series database such as Gnocchi_
16 is recommended. The following instructions are unsupported in future
17 releases.
18
19.. _Gnocchi: http://gnocchi.xyz/
20
12Before you install and configure the Telemetry service, you must 21Before you install and configure the Telemetry service, you must
13create a database, service credentials, and API endpoints. However, 22create a database, service credentials, and API endpoints. However,
14unlike other services, the Telemetry service uses a NoSQL database. 23unlike other services, the Telemetry service uses a NoSQL database.
@@ -64,6 +73,10 @@ Install and configure components
64Configure the Apache HTTP server 73Configure the Apache HTTP server
65-------------------------------- 74--------------------------------
66 75
76.. note::
77
78 The following is only required if Ceilometer's native storage is enabled.
79
67#. Create the ``/etc/apache2/sites-available/ceilometer.conf`` file 80#. Create the ``/etc/apache2/sites-available/ceilometer.conf`` file
68 with the following content: 81 with the following content:
69 82