openstack/magnum
Code Issues Proposed changes

Merge "Update README.rst"

Browse Source
This commit is contained in:
Jenkins 2015-01-07 15:33:35 +00:00 committed by Gerrit Code Review
commit 19cd902e06
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.rst
View File

@ -26,10 +26,10 @@ There are seven different types of objects in the Magnum system:
Two binaries work together to compose the Magnum system. The first binary Two binaries work together to compose the Magnum system. The first binary
accessed by the python-magnumclient code is the magnum-api ReST server. The accessed by the python-magnumclient code is the magnum-api ReST server. The
ReST server may run as one process or multiple processes. When a ReST request ReST server may run as one process or multiple processes. When a ReST request
is sent to the client API, the request is sent via AMQP to the magnum-backend is sent to the client API, the request is sent via AMQP to the magnum-conductor
process. The ReST server is horizontally scalable. AT this time, the backend process. The ReST server is horizontally scalable. At this time, the
is limited to one process, but we intend to add horizontal scalability to the conductor is limited to one process, but we intend to add horizontal
backend as well. scalability to the conductor as well.
The magnum-backend process runs on a controller machine and connects to a The magnum-backend process runs on a controller machine and connects to a
kubernetes or docker ReST API endpoint. The kubernetes and docker ReST API kubernetes or docker ReST API endpoint. The kubernetes and docker ReST API
@ -44,7 +44,7 @@ Features
* Abstractions for bays, containers, nodes, pods, and services * Abstractions for bays, containers, nodes, pods, and services
* Integration with Kubernetes and Docker for backend container technology. * Integration with Kubernetes and Docker for backend container technology.
* Integration with Keystone for multi-tenant security. * Integration with Keystone for multi-tenant security.
* Integraiton with Neutron for k8s multi-tenancy network security. * Integration with Neutron for k8s multi-tenancy network security.
Installation and Usage Installation and Usage
---------------------- ----------------------