diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-13 10:10:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-13 10:10:37 +0000 |
| commit | 88bf4caef8fa916a36e619340ea86d2e75b22bb1 (patch) | |
| tree | 743ba323cd7e19db6d90a80fcbd8068ba8e26e25 | |
| parent | b80865352d576dd313f0fbe35180a48cc3ef2a69 (diff) | |
| parent | 8505a2f32ff963fb79677267f75482a8ec83d972 (diff) | |
| download | ironic-88bf4caef8fa916a36e619340ea86d2e75b22bb1.tar.gz | |
Merge "Add Ceilometer to Ironic's Conceptual Architecture"
| -rw-r--r-- | doc/source/deploy/user-guide.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/source/deploy/user-guide.rst b/doc/source/deploy/user-guide.rst index 59d290a4e..89d0fd272 100644 --- a/doc/source/deploy/user-guide.rst +++ b/doc/source/deploy/user-guide.rst @@ -47,8 +47,8 @@ Conceptual Architecture ======================= The following diagram shows the relationships and how all services come into -play during the provisioning of a physical server. (Note that Swift can be -used with Ironic, but is missing from this diagram.) +play during the provisioning of a physical server. (Note that Ceilometer and +Swift can be used with Ironic, but are missing from this diagram.) .. figure:: ../images/conceptual_architecture.png |