diff --git a/doc/source/draft/index.rst b/doc/source/draft/index.rst index 7db67c62..e90799c5 100644 --- a/doc/source/draft/index.rst +++ b/doc/source/draft/index.rst @@ -40,7 +40,6 @@ Introduction to Murano intro/target_users intro/architecture intro/use_cases - intro/user_stories Using Murano ~~~~~~~~~~~~ diff --git a/doc/source/draft/intro/architecture.png b/doc/source/draft/intro/architecture.png new file mode 100644 index 00000000..9b8b30db Binary files /dev/null and b/doc/source/draft/intro/architecture.png differ diff --git a/doc/source/draft/intro/architecture.rst b/doc/source/draft/intro/architecture.rst index 226daab1..b0dd8518 100644 --- a/doc/source/draft/intro/architecture.rst +++ b/doc/source/draft/intro/architecture.rst @@ -3,3 +3,20 @@ ============ Architecture ============ + +Murano uses other OpenStack services in order to prevent reimplementing of +existing functionality. Murano interacts with these services using their REST +API (via their python clients). The most used external services are keystone +and heat. + +* Heat is used to orchestrate the infrastructural resources such as servers, +volumes, and networks. Murano dynamically creates the heat templates based on +the application definition. + +* All remote operations to the user’s servers are done via an AMQP queue to the +murano-agent. Examples of this are installing and configuring software on the +server. Note that this communication can easily be configured on a separate +instance of AMQP to ensure that the infrastructure and servers are isolated. + +.. image:: architecture.png + :width: 700 px diff --git a/doc/source/draft/intro/use_cases.rst b/doc/source/draft/intro/use_cases.rst index 06c91cfe..fc9ec28e 100644 --- a/doc/source/draft/intro/use_cases.rst +++ b/doc/source/draft/intro/use_cases.rst @@ -6,3 +6,28 @@ ========= Use cases ========= + +* *IT as a Service* + +An IT organization wants to control applications, available to cloud users. +Application management should be simple and not time-consuming. Users should be +able to easily find and create the desired applications. + +* *Self-service portal* + +You may want to create compound combinations of applications dynamically from +simple app blocks. And you can create an environment that satisfies your +requirements in a matter of minutes. Examples of such an environment may be +“Jenkins+Java+Tomcat” or “Jenkins+Gerrit+Java+JBoss”. So testing application in +different environment combinations becomes easier. + +* *Glue layer use case* + +Any external service or technology may be linked to the application in the +cloud. It can be done using the powerful Murano architecture. For example, +Murano supports Docker and OracleDB applications, and to enable this support +no single change was made to Murano itself. So, users can integrate with new +external services with a minimum cost. Currently, murano applications have been +integrated with the following technologies: Docker, Legacy apps VMs or bare +metal, apps outside of OpenStack, and the following ones are planned for the +future: cloudify and TOSCA, apache brooklin, APS. diff --git a/doc/source/draft/intro/user_stories.rst b/doc/source/draft/intro/user_stories.rst deleted file mode 100644 index 59f0d47b..00000000 --- a/doc/source/draft/intro/user_stories.rst +++ /dev/null @@ -1,8 +0,0 @@ -.. _user-stories: - -.. toctree:: - :maxdepth: 2 - -============ -User stories -============