diff --git a/src/user-guide/src/docbkx/content/environments.xml b/src/user-guide/src/docbkx/content/environments.xml index a67d494..e8001d8 100644 --- a/src/user-guide/src/docbkx/content/environments.xml +++ b/src/user-guide/src/docbkx/content/environments.xml @@ -29,6 +29,9 @@ Create; + + Edit; + Delete; @@ -43,16 +46,20 @@ Once you installed all Murano components and logged-in to horizon dashboard successfully you will see Murano tab: - + First thing you need to do is to create an environment. - To do this, navigate to the "Environments" page and click the "Create Environment". After setting name to your virtual environment it will be created. + To do this, navigate to the + Deployment > Environments + page and click to the + "Create Environment" + . After setting name to your virtual environment it will be created. - @@ -61,38 +68,42 @@ -
- Creating service prototype + Adding application to the environment - All services should be created in the context of Environment. After Environment is created, you need to create service prototypes + After Environment is created, you need to add applications to this environment and then deploy the Environment. When deploy process is done instances - with your services will be spawned in Openstack. - To create a service prototype navigate to page with the list of environment services by + with your aplications will be spawned in OpenStack. + To add an application navigate to page with the list of environment services by clicking on the environment name (or on the "Services" button) and then, click - the "Create Service" button. + the + "Add Application"button. - + - You have an opportunity to create one of the following services: + After clicking on the button you will be redirected to the "Application Catalog" page. + Here you can see all applications: public applications and application uploaded by yourself. + (Information about how to upload your own package to repository is availiable in appropriate chapter.) + You have an opportunity to add some of them. Base public applications are following: - + - Once you choose service that you want to create click "Next" and fill the form. - Forms for each service are specific. - To see more information about filling the form for a specific service follow one of the link below: + Once you choose application that you want to add click "Add to Env" and fill the form. + Forms for each application are specific. + To see more information about filling the form for a specific application follow one of the link below: @@ -132,6 +143,13 @@ Apache HTTP Server is a web server application notable for playing a key role in the initial growth of the World Wide Web. This service can install Apache with PHP module or without it. + + + + + Apache Tomcat: + Apache Tomcat is an open source software implementation of the Java Servlet and JavaServer Pages technologies. + @@ -180,9 +198,18 @@ SQL Server Cluster the way you want. + + + + PostgreSQL: + + PostgreSQL, often simply "Postgres", is an object-relational database management + system with an emphasis on extensibility and standards-compliance. + + - On the last step of creating service prototype you have opportunity to set + On the last step of creating application prototype you have opportunity to set the hardware flavor of the instance which will be created - and the image with the operating system, which will be installed on the instance. Also you may select availability zone, if there are more @@ -586,12 +613,12 @@
Deploying environment - Once all services are prepared you can send environment to deploy. - Just press the "Deploy Environment" button. + Once all application are added you can send environment to deploy. + Just press the "Deploy This Environment" button. - + @@ -600,7 +627,7 @@ - @@ -624,12 +651,12 @@ As long as installation and configuration are in progress, environment is in Deploy in progress state. Depending on how many - services you are deploying or how many nodes in your cluster, process of spawning instances, + applications you are deploying or how many nodes in your cluster, process of spawning instances, installation and post installation settings takes from 10 minutes up to one hour. - + @@ -645,8 +672,8 @@
Working with deployed environment - Congratulations! After some time waiting you are able to operate with the services. - To get information about installed services, navigate to service detailed page. + Congratulations! After some time waiting you are able to operate with the applications. + To get information about installed application, navigate to service detailed page. To do that click on the environment name and then on the name of the service you what to know about. @@ -675,13 +702,13 @@ There are more things you can do with Murano Environment: - Add new services and deploy it again; + Add new application and deploy it again; - Delete outdated and unnecessary environments or services; + Delete outdated and unnecessary environments or applications; - Browse deployment history and service installation logs; + Browse deployment history and application installation logs; Rename your environment. @@ -698,13 +725,13 @@
Deleting - Services as well as environments can be easily deleted. + Applications as well as environments can be easily deleted. - To delete an environment go to the environment index page and click "More" -> "Delete Environment" in Actions column of ready to delete environment. + To delete an environment go to the Deployment > Environments index page and click "More" -> "Delete Environment" in Actions column of ready to delete environment. - @@ -716,9 +743,9 @@ - To delete a service go service list page and click the "Delete Service" button in Actions column. Note: - If you are deleting service that was already deployed you'll need to Deploy the environment again by pressing corresponding button. - In case you want to delete service prototype - it has "Service draft created" in the + To delete an application go to the application list page and click the "Delete Service" button in Actions column. Note: + If you are deleting application that was already deployed you'll need to Deploy the environment again by pressing corresponding button. + In case you want to delete application prototype - it has "Service draft created" in the Last operation column (see the screenshot below) - changes applies right away. @@ -740,7 +767,7 @@ - + @@ -778,16 +805,16 @@ - + - Environment name is not involved in service creation process so you can use spaces and any other - characters you want. + Environment name is not involved in application creation process but environment name have to corresponds with + heat stack name. So name must contains only alphanumeric characters (case sensitive) and start with an alpha character. - diff --git a/src/user-guide/src/docbkx/content/images.xml b/src/user-guide/src/docbkx/content/images.xml index ded9493..a653c9a 100644 --- a/src/user-guide/src/docbkx/content/images.xml +++ b/src/user-guide/src/docbkx/content/images.xml @@ -23,14 +23,14 @@ Metadata property of Glance image is used. Murano Dashboard allows to add that property from a separate view. Navigate to the Murano tab and go to - Images + Manage > Images panel. To operate with Glance Images you need to have admin rights! - + You are browsing Glance images with correctly set "murano_image_info" property - image metadata. From this diff --git a/src/user-guide/src/docbkx/images/Application_Catalog/AppCatalog.png b/src/user-guide/src/docbkx/images/Application_Catalog/AppCatalog.png new file mode 100755 index 0000000..69de640 Binary files /dev/null and b/src/user-guide/src/docbkx/images/Application_Catalog/AppCatalog.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/add-app-btn.png b/src/user-guide/src/docbkx/images/Environments/add-app-btn.png new file mode 100644 index 0000000..94bb2c9 Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/add-app-btn.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/create-env.png b/src/user-guide/src/docbkx/images/Environments/create-env.png new file mode 100644 index 0000000..5788c61 Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/create-env.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/created-env.jpg b/src/user-guide/src/docbkx/images/Environments/created-env.jpg new file mode 100644 index 0000000..816759c Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/created-env.jpg differ diff --git a/src/user-guide/src/docbkx/images/Environments/delete-env.png b/src/user-guide/src/docbkx/images/Environments/delete-env.png new file mode 100644 index 0000000..ebcd81f Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/delete-env.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/deploy-env-btn.png b/src/user-guide/src/docbkx/images/Environments/deploy-env-btn.png new file mode 100644 index 0000000..4978371 Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/deploy-env-btn.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/deploy-in-prg.png b/src/user-guide/src/docbkx/images/Environments/deploy-in-prg.png new file mode 100644 index 0000000..018343c Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/deploy-in-prg.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/edit-env.png b/src/user-guide/src/docbkx/images/Environments/edit-env.png new file mode 100644 index 0000000..1ac2520 Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/edit-env.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/main-envs.png b/src/user-guide/src/docbkx/images/Environments/main-envs.png new file mode 100644 index 0000000..a539c71 Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/main-envs.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/rename-env.png b/src/user-guide/src/docbkx/images/Environments/rename-env.png new file mode 100644 index 0000000..83e3be2 Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/rename-env.png differ diff --git a/src/user-guide/src/docbkx/images/Environments/show-env.png b/src/user-guide/src/docbkx/images/Environments/show-env.png new file mode 100644 index 0000000..3c4cc5d Binary files /dev/null and b/src/user-guide/src/docbkx/images/Environments/show-env.png differ diff --git a/src/user-guide/src/docbkx/images/Images/index.png b/src/user-guide/src/docbkx/images/Images/index.png deleted file mode 100644 index 5cf57e4..0000000 Binary files a/src/user-guide/src/docbkx/images/Images/index.png and /dev/null differ diff --git a/src/user-guide/src/docbkx/images/Images/main-images.png b/src/user-guide/src/docbkx/images/Images/main-images.png new file mode 100644 index 0000000..b407a0a Binary files /dev/null and b/src/user-guide/src/docbkx/images/Images/main-images.png differ diff --git a/src/user-guide/src/docbkx/images/deploy_btn.png b/src/user-guide/src/docbkx/images/deploy_btn.png deleted file mode 100644 index 96ee3e3..0000000 Binary files a/src/user-guide/src/docbkx/images/deploy_btn.png and /dev/null differ diff --git a/src/user-guide/src/docbkx/images/env_btn.png b/src/user-guide/src/docbkx/images/env_btn.png deleted file mode 100644 index 032969b..0000000 Binary files a/src/user-guide/src/docbkx/images/env_btn.png and /dev/null differ diff --git a/src/user-guide/src/docbkx/images/env_created.png b/src/user-guide/src/docbkx/images/env_created.png deleted file mode 100644 index 9413dc3..0000000 Binary files a/src/user-guide/src/docbkx/images/env_created.png and /dev/null differ diff --git a/src/user-guide/src/docbkx/images/env_delete.png b/src/user-guide/src/docbkx/images/env_delete.png deleted file mode 100644 index 72959f3..0000000 Binary files a/src/user-guide/src/docbkx/images/env_delete.png and /dev/null differ diff --git a/src/user-guide/src/docbkx/images/env_edit.png b/src/user-guide/src/docbkx/images/env_edit.png deleted file mode 100644 index ffcdce2..0000000 Binary files a/src/user-guide/src/docbkx/images/env_edit.png and /dev/null differ diff --git a/src/user-guide/src/docbkx/images/service_btn.png b/src/user-guide/src/docbkx/images/service_btn.png deleted file mode 100644 index a74b5ad..0000000 Binary files a/src/user-guide/src/docbkx/images/service_btn.png and /dev/null differ diff --git a/src/user-guide/src/docbkx/user-guide.xml b/src/user-guide/src/docbkx/user-guide.xml index b5d7919..fc92095 100644 --- a/src/user-guide/src/docbkx/user-guide.xml +++ b/src/user-guide/src/docbkx/user-guide.xml @@ -24,7 +24,7 @@ version="5.0"> Murano User Guide - v0.4 + v0.5 Copyright details are filled in by the template. Change