diff --git a/src/developers-guide/src/docbkx/content/installation-guide.xml b/src/developers-guide/src/docbkx/content/installation-guide.xml
index 5dbfd14..ddee0f8 100644
--- a/src/developers-guide/src/docbkx/content/installation-guide.xml
+++ b/src/developers-guide/src/docbkx/content/installation-guide.xml
@@ -85,7 +85,7 @@
Superuser privileges is required to install and configure system packages. Let's switch to root account:
@@ -284,9 +284,9 @@ initctl start murano-api
Install
- Murano Condutor uses OpenStack Heat for new virtual machines creation, therefore Heat should
+ Murano Conductor uses OpenStack Heat for new virtual machines creation, therefore Heat should
been installed and configured. Some services require the Internet access for virtual machines to
- successfull deployment.
+ successful deployment.
The detailed information about Heat configuration is described
here.
@@ -306,7 +306,7 @@ initctl start murano-api
Superuser privileges is required to install and configure system packages. Let's switch to root account:
@@ -478,7 +478,7 @@ initctl start murano-conductor
Superuser privileges is required to install and configure system packages. Let's switch to root account:
@@ -516,6 +516,10 @@ sh setup-centos.sh install
SSL configuration
+
+ Murano components are able to work with SSL. This chapter will
+ help your to make proper settings with SSL configuration.
+ HTTPS for Murano API
diff --git a/src/developers-guide/src/docbkx/content/knownissues.xml b/src/developers-guide/src/docbkx/content/knownissues.xml
index 8eb6c28..f521cef 100644
--- a/src/developers-guide/src/docbkx/content/knownissues.xml
+++ b/src/developers-guide/src/docbkx/content/knownissues.xml
@@ -52,11 +52,13 @@
Farm services can't be deployed without KeyPair. If KeyPair is not set
load balancer won't be created and these messages will show up in logs:
+
+
And deploy will hang up.
-
\ No newline at end of file
diff --git a/src/developers-guide/src/docbkx/content/overview.xml b/src/developers-guide/src/docbkx/content/overview.xml
index fe8230c..224514b 100644
--- a/src/developers-guide/src/docbkx/content/overview.xml
+++ b/src/developers-guide/src/docbkx/content/overview.xml
@@ -23,6 +23,10 @@
version="5.0">
OverviewWelcome to Murano Project.
+ Full information about Murano you can found information in openstack wiki
+ page.
+
+
Murano is intended to get opportunity for non-experienced
users to deploy reliable Windows-based environments with 1-Click.
Key goal is to provide UI and API which
diff --git a/src/developers-guide/src/docbkx/content/specification.xml b/src/developers-guide/src/docbkx/content/specification.xml
index 7726871..796940d 100644
--- a/src/developers-guide/src/docbkx/content/specification.xml
+++ b/src/developers-guide/src/docbkx/content/specification.xml
@@ -2664,7 +2664,7 @@
- ASP.NET Application Farm Unit Object
+ MS SQL Server Unit Object
diff --git a/src/developers-guide/src/docbkx/content/workflows.xml b/src/developers-guide/src/docbkx/content/workflows.xml
index 39686f7..20a196b 100644
--- a/src/developers-guide/src/docbkx/content/workflows.xml
+++ b/src/developers-guide/src/docbkx/content/workflows.xml
@@ -159,8 +159,6 @@ For both list and map functions names of item nodes ("item" in examples above) i
Workflows
-
- About workflows
Workflows are XML DSL scripts that describe the steps that conductor need to perform in order to deploy specified environment. All workflow constructs are just ordinary DSL functions similar to those described above.
@@ -171,10 +169,12 @@ For both list and map functions names of item nodes ("item" in examples above) i
Actions are:
+
Heat commands that update or delete Heat Stack: , ]]>
+
- Send command to Murano Agent: ]]>
+ Send command to Murano Agent: ]]>
Report state to API: ]]>
@@ -185,26 +185,31 @@ For both list and map functions names of item nodes ("item" in examples above) i
Workflow logic can be described in 6 steps:
- Choose a node (set of nodes) to update. If none of the nodes can be updated we are done.
+
+ Choose a node (set of nodes) to update. If none of the nodes can be updated we are done.
+
- According to the current state of node (that is a part of input Object Model) choose appropriate command to execute (update Heat stack or issue PowerShell command)
+
+ According to the current state of node (that is a part of input Object Model) choose appropriate command to execute (update Heat stack or issue PowerShell command)
+
- Select appropriate information from Object Model and substitute it into chosen template
+
+ Select appropriate information from Object Model and substitute it into chosen template
+
- Execute command
+ Execute command
- Update Object Model according to command execution result
+ Update Object Model according to command execution result
- Go to step 1
+ Go to step 1
- Accessing Object ModelObject Model is a definition of environment that Murano Conductor was asked to deploy.
diff --git a/src/developers-guide/src/docbkx/developers-guide.xml b/src/developers-guide/src/docbkx/developers-guide.xml
index 75efcae..13eed6b 100644
--- a/src/developers-guide/src/docbkx/developers-guide.xml
+++ b/src/developers-guide/src/docbkx/developers-guide.xml
@@ -73,8 +73,6 @@
contact
Murano community directly by
openstack-dev@lists.openstack.org
- (please, note that your email address should be registered in launchpad, otherwise your mail will be ignored
- by mailing system).
We’re going to hold public weekly meetings on Mondays at 15:00 UTC on #openstack-meeting-alt irc channel.
diff --git a/src/user-guide/src/docbkx/content/murano-dashboard.xml b/src/user-guide/src/docbkx/content/murano-dashboard.xml
new file mode 100644
index 0000000..1800cba
--- /dev/null
+++ b/src/user-guide/src/docbkx/content/murano-dashboard.xml
@@ -0,0 +1,262 @@
+
+
+
+ Murano dashboard plugin
+
+ For a Murano usage you should be familiar with Openstack. Murano Dashboard is just a plugin to Openstack dashboard - Horizon.
+ Please visit
+ horizon user guide
+ first to see how dashboard is organized and how login to it.
+
+
+ Creating environment
+ Once you installed all Murano components and login to horizon dashboard successfully you will see Environments panel:
+
+
+
+
+
+
+ First you need to do is to create an environment - virtual Windows Data Center which will contain different Windows services.
+ Navigate to "Environments" page and click "Create Environment". After setting name to your virtual environment it will be created.
+ Just created environment has status Ready to configure.
+
+
+
+
+
+
+
+
+ Creating service prototype
+
+ All services should be created within the framework of Environment
+ - virtual Windows Data Center. First you need to create one or more service's prototypes
+ and then send Environment to deploy process. After that one or more instances with your service be spawned on Openstack.
+ To create service prototype navigate to environment services by
+ clicking on environment name (or on "Services" button) and press on "Create Service" button.
+
+
+
+
+
+
+
+ You have opportunity to create one of the following services:
+
+
+
+
+
+
+
+ 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 specified service follow one of the link below:
+
+
+
+
+ Active Directory:
+ Active Directory is a directory service implemented by Microsoft for Windows domain networks.
+ In one installation in addition to primary Domain Controller
+ you can add optional count of secondary Domain Controllers.
+ Any other services you are intending to create can be
+ joined to that domain.
+
+
+
+
+
+ Internet Information Service:
+ IIS is a web server and a set of feature extension modules.
+
+
+
+
+
+ Internet Information Web Farm Service:
+
+ Murano installs the Web Farm Framework on the controller server,
+ configures the primary server and prepares the secondary servers.
+ In addition load balancer is installed to monitor service statuses.
+
+
+
+
+
+ ASP.NET Service:
+
+ is a server-side Web application framework designed for Web
+ development to produce dynamic Web pages. Service is able
+ to install custom application onto one IIS Web Server. Murano installs
+ all needed components and make proper configuration.
+
+
+
+
+
+ ASP.NET Farm Service:
+
+ ASP.NET Farm Service installs a custom application on a
+ load-balanced array of IIS servers
+
+
+
+
+ MS SQL Service:
+ Microsoft SQL Service is a relational database management system.
+
+
+
+
+
+ SQL Server Failover Cluster:
+
+ Murano installs all needed components and configures your
+ SQL Server Cluster the way you want.
+
+
+
+
+ On the last step of creating service 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
+ then one in your environment.
+
+
+
+
+
+
+
+ Active Directory
+
+
+
+
+
+
+
+ Internet Information Service
+
+
+
+
+
+
+
+ Internet Information Web Farm Service
+
+
+
+
+
+
+
+ ASP.NET Service
+
+
+
+
+
+
+
+ ASP.NET Farm Service
+
+
+
+
+
+
+
+ MS SQL Service
+
+
+
+
+
+
+
+ SQL Server Failover Cluster
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Deploying environment
+
+ Once all services are prepared you can send environment to deploy
+ and wait while Murano installing and configuring your services.
+ Just press the "Deploy Environment" button.
+
+
+
+
+
+
+
+ You can monitor deploying process. Just go to the Log tab on service
+ detailed page where you can get by clicking on the service name.
+
+
+
+
+
+
+
+ And now you can see installation progress.
+
+
+
+
+
+
+
+
+ Until installation finished environment are in deployng state.
+
+
+
+ Detailed information
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/user-guide/src/docbkx/content/overview.xml b/src/user-guide/src/docbkx/content/overview.xml
new file mode 100644
index 0000000..0e9f89c
--- /dev/null
+++ b/src/user-guide/src/docbkx/content/overview.xml
@@ -0,0 +1,56 @@
+
+
+
+ How can I use Murano Service?
+
+ Murano is intended to get opportunity for non-experienced
+ users to deploy reliable Windows-based environments with 1-Click.
+ This document describes steps for creation Windows Environment with different services.
+ You'll see how it's easy with Murano.
+
+
+ Document change history
+ The following table describes the most recent changes:
+
+
+
+
Revision Date
+
Summary of Changes
+
+
+
+
+
September. 4, 2013
+
+
+
+ Initial document creation.
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/user-guide/src/docbkx/images/ad.png b/src/user-guide/src/docbkx/images/ad.png
new file mode 100644
index 0000000..4219f53
Binary files /dev/null and b/src/user-guide/src/docbkx/images/ad.png differ
diff --git a/src/user-guide/src/docbkx/images/asp_net.png b/src/user-guide/src/docbkx/images/asp_net.png
new file mode 100644
index 0000000..d99315d
Binary files /dev/null and b/src/user-guide/src/docbkx/images/asp_net.png differ
diff --git a/src/user-guide/src/docbkx/images/asp_net_farm.png b/src/user-guide/src/docbkx/images/asp_net_farm.png
new file mode 100644
index 0000000..198564f
Binary files /dev/null and b/src/user-guide/src/docbkx/images/asp_net_farm.png differ
diff --git a/src/user-guide/src/docbkx/images/cluster1.png b/src/user-guide/src/docbkx/images/cluster1.png
new file mode 100644
index 0000000..0811e44
Binary files /dev/null and b/src/user-guide/src/docbkx/images/cluster1.png differ
diff --git a/src/user-guide/src/docbkx/images/cluster1a.png b/src/user-guide/src/docbkx/images/cluster1a.png
new file mode 100644
index 0000000..5c0dae8
Binary files /dev/null and b/src/user-guide/src/docbkx/images/cluster1a.png differ
diff --git a/src/user-guide/src/docbkx/images/cluster2.png b/src/user-guide/src/docbkx/images/cluster2.png
new file mode 100644
index 0000000..44dcf54
Binary files /dev/null and b/src/user-guide/src/docbkx/images/cluster2.png differ
diff --git a/src/user-guide/src/docbkx/images/deploy_btn.png b/src/user-guide/src/docbkx/images/deploy_btn.png
new file mode 100644
index 0000000..6bd128c
Binary files /dev/null and b/src/user-guide/src/docbkx/images/deploy_btn.png differ
diff --git a/src/user-guide/src/docbkx/images/deploy_started.png b/src/user-guide/src/docbkx/images/deploy_started.png
new file mode 100644
index 0000000..4f1dd12
Binary files /dev/null and b/src/user-guide/src/docbkx/images/deploy_started.png differ
diff --git a/src/user-guide/src/docbkx/images/done.png b/src/user-guide/src/docbkx/images/done.png
new file mode 100644
index 0000000..aac110a
Binary files /dev/null and b/src/user-guide/src/docbkx/images/done.png differ
diff --git a/src/user-guide/src/docbkx/images/2.png b/src/user-guide/src/docbkx/images/env_btn.png
similarity index 100%
rename from src/user-guide/src/docbkx/images/2.png
rename to src/user-guide/src/docbkx/images/env_btn.png
diff --git a/src/user-guide/src/docbkx/images/env_created.png b/src/user-guide/src/docbkx/images/env_created.png
new file mode 100644
index 0000000..3f1d1e2
Binary files /dev/null and b/src/user-guide/src/docbkx/images/env_created.png differ
diff --git a/src/user-guide/src/docbkx/images/env_deploy.png b/src/user-guide/src/docbkx/images/env_deploy.png
new file mode 100644
index 0000000..68dbf02
Binary files /dev/null and b/src/user-guide/src/docbkx/images/env_deploy.png differ
diff --git a/src/user-guide/src/docbkx/images/1.png b/src/user-guide/src/docbkx/images/env_panel.png
similarity index 100%
rename from src/user-guide/src/docbkx/images/1.png
rename to src/user-guide/src/docbkx/images/env_panel.png
diff --git a/src/user-guide/src/docbkx/images/iis.png b/src/user-guide/src/docbkx/images/iis.png
new file mode 100644
index 0000000..5a184ff
Binary files /dev/null and b/src/user-guide/src/docbkx/images/iis.png differ
diff --git a/src/user-guide/src/docbkx/images/iis_farm.png b/src/user-guide/src/docbkx/images/iis_farm.png
new file mode 100644
index 0000000..0ef9447
Binary files /dev/null and b/src/user-guide/src/docbkx/images/iis_farm.png differ
diff --git a/src/user-guide/src/docbkx/images/iis_farm_detail.png b/src/user-guide/src/docbkx/images/iis_farm_detail.png
new file mode 100644
index 0000000..5d56a3b
Binary files /dev/null and b/src/user-guide/src/docbkx/images/iis_farm_detail.png differ
diff --git a/src/user-guide/src/docbkx/images/last_step.png b/src/user-guide/src/docbkx/images/last_step.png
new file mode 100644
index 0000000..23772ef
Binary files /dev/null and b/src/user-guide/src/docbkx/images/last_step.png differ
diff --git a/src/user-guide/src/docbkx/images/logs.png b/src/user-guide/src/docbkx/images/logs.png
new file mode 100644
index 0000000..594da67
Binary files /dev/null and b/src/user-guide/src/docbkx/images/logs.png differ
diff --git a/src/user-guide/src/docbkx/images/service_btn.png b/src/user-guide/src/docbkx/images/service_btn.png
new file mode 100644
index 0000000..3f00f26
Binary files /dev/null and b/src/user-guide/src/docbkx/images/service_btn.png differ
diff --git a/src/user-guide/src/docbkx/images/service_list.png b/src/user-guide/src/docbkx/images/service_list.png
new file mode 100644
index 0000000..6f5fd16
Binary files /dev/null and b/src/user-guide/src/docbkx/images/service_list.png differ
diff --git a/src/user-guide/src/docbkx/images/service_name.png b/src/user-guide/src/docbkx/images/service_name.png
new file mode 100644
index 0000000..11d8040
Binary files /dev/null and b/src/user-guide/src/docbkx/images/service_name.png differ
diff --git a/src/user-guide/src/docbkx/images/services.png b/src/user-guide/src/docbkx/images/services.png
new file mode 100644
index 0000000..d38e141
Binary files /dev/null and b/src/user-guide/src/docbkx/images/services.png differ
diff --git a/src/user-guide/src/docbkx/images/sql.png b/src/user-guide/src/docbkx/images/sql.png
new file mode 100644
index 0000000..b471109
Binary files /dev/null and b/src/user-guide/src/docbkx/images/sql.png differ