diff --git a/src/administrators-guide/src/docbkx/administrators-guide.xml b/src/administrators-guide/src/docbkx/administrators-guide.xml index 33d2af9..705dcc8 100644 --- a/src/administrators-guide/src/docbkx/administrators-guide.xml +++ b/src/administrators-guide/src/docbkx/administrators-guide.xml @@ -24,21 +24,17 @@ Murano Administrator's Guide - - - - - Mirantis, Inc. + - 2013 - Mirantis, Inc. + + v0.2 - Murano™ - 2013-09-05 + Murano + 2013-09-09 Copyright details are filled in by the template. Change the value of the diff --git a/src/developers-guide/src/docbkx/developers-guide.xml b/src/developers-guide/src/docbkx/developers-guide.xml index 13eed6b..8e6a094 100644 --- a/src/developers-guide/src/docbkx/developers-guide.xml +++ b/src/developers-guide/src/docbkx/developers-guide.xml @@ -25,21 +25,13 @@ Murano Developers Guide - - - - - Mirantis, Inc. + - - 2013 - Mirantis, Inc. - - v0.1 - Murano™ - 2013-09-04 + v0.2 + Murano + 2013-09-09 Copyright details are filled in by the template. Change diff --git a/src/getting-started/pom.xml b/src/getting-started/pom.xml index 0704684..b17ab26 100644 --- a/src/getting-started/pom.xml +++ b/src/getting-started/pom.xml @@ -38,12 +38,20 @@ - ${basedir}/src/docbkx/style/config.xsl + ../style/config.xsl - ${basedir}/src/docbkx/style/getting-started.css + ../style/getting-started.css true 100 + + + + + + + + diff --git a/src/getting-started/src/docbkx/content/before_you_begin.xml b/src/getting-started/src/docbkx/content/before_you_begin.xml index 7686d3c..940500a 100644 --- a/src/getting-started/src/docbkx/content/before_you_begin.xml +++ b/src/getting-started/src/docbkx/content/before_you_begin.xml @@ -40,7 +40,7 @@ Use Appropriate Branch There are a few branches that can be found in all Murano repositories: master, release-0.1, release-0.2 and so on. Branch master is the most recent between the releases, but not as stable as release-x.x branches. - Use Separate vHost in RabbitMQ + Use Separate vHost in RabbitMQ In general it is OK to configure Murano services to use the root (‘/’) vHost in RabbitMQ and use the same user credentials as OpenStack services use. However, we recommend to create a separate vHost with separate user for each Murano devbox. There are a few reasons for that: diff --git a/src/getting-started/src/docbkx/content/setup_devbox.xml b/src/getting-started/src/docbkx/content/setup_devbox.xml index dd58f4c..1ce0379 100644 --- a/src/getting-started/src/docbkx/content/setup_devbox.xml +++ b/src/getting-started/src/docbkx/content/setup_devbox.xml @@ -44,7 +44,7 @@
Vagrant Way - The simplest way to get working Murano devbox is Vagrant tool. + The simplest way to get working Murano devbox is Vagrant tool. This tool is available for Ubuntu only. Prepare Environment (Ubuntu) @@ -153,7 +153,8 @@ LAB_HOST='***.***.***.***' -># cd /opt/git># git clone git://github.com/stackforge/murano-deployment.git +># cd /opt/git +># git clone git://github.com/stackforge/murano-deployment.git @@ -252,23 +253,27 @@ BRANCH_NAME='release-0.2' Install the component + + + Ubuntu + + +># ./murano-api/setup.sh install + + + CentOS + + +># ./murano-api/setup-centos.sh install + - -># murano-api/setup.sh install - - - - - -># murano-api/setup-centos.sh install - Configuration: ># cd /etc/murano-api && cp murano-api-paste.ini.sample \ murano-api-paste.ini ># cd /etc/murano-api && cp murano-api.conf.sample murano-api.conf - + Before start service, set proper configuration values in @@ -298,19 +303,20 @@ BRANCH_NAME='release-0.2' Install the component + + Ubuntu + + +># ./murano-conductor/setup.sh install + + + CentOS + + +># ./murano-conductor/setup-centos.sh install + - -># murano-conductor/setup.sh install - - - - on CentOS - - - -># murano-conductor/setup-centos.sh install - Configuration ># cd /etc/murano-conductor && cp \ @@ -339,9 +345,8 @@ BRANCH_NAME='release-0.2' How-to do this: - On Ubuntu - - + Ubuntu + ># apt-get install -y memcached libapache2-mod-wsgi openstack-dashboard ># dpkg --purge openstack-dashboard-ubuntu-theme # optional step @@ -349,12 +354,10 @@ BRANCH_NAME='release-0.2' After installation is complete, openstack dashboard should be available at: http://<your VM IP>/horizon - - - on CentOS - - + + CentOS + ># yum install python-netaddr.noarch \ python-keystoneclient.noarch \ python-django-horizon.noarch \ @@ -362,33 +365,33 @@ BRANCH_NAME='release-0.2'  httpd.x86_64 mod_wsgi.x86_64 \ openstack-dashboard.noarch --assumeyes ># chkconfig httpd on - - After installation is complete, openstack dashboard should be available - at: http://<your VM IP>/dashboard - - Installation of the murano-dashboard is described below. + + After installation is complete, openstack dashboard should be available + at: http://<your VM IP>/dashboard + + + + Installation of the murano-dashboard described below. Get source code - - ># git clone https://github.com/stackforge/murano-dashboard -b release-0.2 ># chmod +x murano-dashboard/setup*.sh - + Install the component - On Ubuntu + Ubuntu -># murano-dashboard/setup.sh install +># ./murano-dashboard/setup.sh install - on CentOS + CentOS -># murano-dashboard/setup-centos.sh install +># ./murano-dashboard/setup-centos.sh install diff --git a/src/getting-started/src/docbkx/content/setup_lab_environment.xml b/src/getting-started/src/docbkx/content/setup_lab_environment.xml index 87c11fa..fb6be3a 100644 --- a/src/getting-started/src/docbkx/content/setup_lab_environment.xml +++ b/src/getting-started/src/docbkx/content/setup_lab_environment.xml @@ -143,7 +143,7 @@ ># mkdir -p /opt/samba/share ->#chown nobody:nogroup /opt/samba/share +># chown nobody:nogroup /opt/samba/share @@ -171,7 +171,8 @@ -># restart smbd># restart nmdb +># restart smbd +># restart nmdb Copy Prerequisites Into The Share @@ -187,8 +188,55 @@ - Add files to the folder structure under - /opt/samba/share folder: + Download and put the following files into the specified paths under + /opt/samba/share folder: + + + + + ASP .NET MVC 4 setup package: + Prerequisites/AspNetMVC4Setup.exe + + + + + + Additional files to build ASP application + : should be placed to Prerequisites/WebApplications.exe + + + + + + MS SQL Server 2012: Extract the content of the ISO/EXE file + to the Prerequisites/SQL Server/2012/. + After that setup.exe should be located inside this directory. + + + + + + Microsoft® Windows PowerShell Extensions for Microsoft® SQL Server®2012: + Prerequisites/SQL Server/Tools/PowerShellTools.msi + + + + + + Microsoft® SQL Server® 2012 Shared + Management Objects: + Prerequisites/SQL Server/Tools/SharedManagementObjects.msi + + + + + + Microsoft® System CLR Types for Microsoft® SQL Server® 2012 + : + Prerequisites/SQL Server/Tools/SQLSysClrTypes.msi + + + @@ -236,7 +284,7 @@ - Download and put the following files to the specified paths under + Download and put the following files into the specified paths under /opt/image-builder folder: @@ -320,7 +368,7 @@ - + Murano Agent share/files/MuranoAgent.zip @@ -382,24 +430,24 @@ Import the Windows Server 2012 image into Glance - + + + + >$ cd /opt/image-builder/share/images >$ glance image-create --name ws-2012-std --disk-format qcow2 \ --container-type bare --file ws-2012-std.qcow2 \ --is-public true \ --property murano_image_info='{"type":"ws-2012-std",\ "title":"Windows Server 2012 Standard"}' - - - - - The value of the --property argument named - murano_image_info is a JSON string. Only double quotes are - valid in JSON, so please type the string exactly as in the - example above. - - - - + + + + The value of the --property argument named + murano_image_info is a JSON string. Only double quotes are + valid in JSON, so please type the string exactly as in the + example above. + +
\ No newline at end of file diff --git a/src/getting-started/src/docbkx/getting-started.xml b/src/getting-started/src/docbkx/getting-started.xml index 4bb51f0..782158c 100644 --- a/src/getting-started/src/docbkx/getting-started.xml +++ b/src/getting-started/src/docbkx/getting-started.xml @@ -25,21 +25,13 @@ Murano Getting Started Guide - - - - - Mirantis, Inc. + - - 2013 - Mirantis, Inc. - - v0.1 - Murano™ - 2013-09-04 + v0.2 + Murano + 2013-09-09 Copyright details are filled in by the template. Change diff --git a/src/user-guide/pom.xml b/src/user-guide/pom.xml index 58c04d8..0bf9a07 100644 --- a/src/user-guide/pom.xml +++ b/src/user-guide/pom.xml @@ -38,9 +38,9 @@ - ${basedir}/src/docbkx/style/config.xsl + ../style/config.xsl - ${basedir}/src/docbkx/style/user-guide.css + ../style/user-guide.css true 100 @@ -50,6 +50,12 @@ + + + + + + diff --git a/src/user-guide/src/docbkx/content/murano-dashboard.xml b/src/user-guide/src/docbkx/content/murano-dashboard.xml index 6403e58..bbccf4b 100644 --- a/src/user-guide/src/docbkx/content/murano-dashboard.xml +++ b/src/user-guide/src/docbkx/content/murano-dashboard.xml @@ -38,12 +38,21 @@ First thing you need to do is to create an environment - virtual Windows Data Center which will contain different Windows services. - 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 "Environments" page and click the "Create Environment". After setting name to your virtual environment it will be created. + + + + + + + Just created environment has status Ready to configure. - + @@ -51,11 +60,11 @@ Creating service prototype All services should be created in the context of Environment - - virtual Windows Data Center. After Environment is created services prototypes + - virtual Windows Data Center. After Environment is created, you need to create services prototypes 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 environment services by - clicking on the environment name (or on the "Services" button) and click + To create a service prototype 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. @@ -112,7 +121,7 @@ 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. + all needed components and makes proper configuration. @@ -160,7 +169,7 @@ - + @@ -474,7 +483,7 @@ As long as installation and configuration are in progress, environment - is in Deploying state. Depending on how many + 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, installation and post installation settings takes from 10 minutes up to one hour. @@ -543,7 +552,7 @@ Murano gives an opportunity to supplement already deployed environment. Thus if you already deployed the Active Directory service and want to add - any other services just create desired service prototype and click the "Deploy Environment" button. + any other services just create desired service prototype and click the "Deploy This Environment" button. During service prototype creation you can join this service to the existent Active Directory domain. @@ -649,7 +658,7 @@ How to debug OpenStack Heat? If you can execute Heat command via console interface - all good. It is - the most simple way to check Heat state on the node - jest execute CLI + the most simple way to check Heat state on the node - just execute CLI command 'heat list'. See more information about Heat in openstack wiki diff --git a/src/user-guide/src/docbkx/images/active_directory.png b/src/user-guide/src/docbkx/images/active_directory.png new file mode 100644 index 0000000..6f5e971 Binary files /dev/null and b/src/user-guide/src/docbkx/images/active_directory.png differ diff --git a/src/user-guide/src/docbkx/images/ad.png b/src/user-guide/src/docbkx/images/ad.png deleted file mode 100644 index 4219f53..0000000 Binary files a/src/user-guide/src/docbkx/images/ad.png and /dev/null differ diff --git a/src/user-guide/src/docbkx/style/user-guide.css b/src/user-guide/src/docbkx/style/user-guide.css index 4c7b14b..3aa4e09 100644 --- a/src/user-guide/src/docbkx/style/user-guide.css +++ b/src/user-guide/src/docbkx/style/user-guide.css @@ -29,7 +29,7 @@ body { display: block; padding: 10px; border: 1px solid #bbb; - background-color: #BDBDBD; + background-color: #eee; color: #000; overflow: auto; border-radius: 2.5px; diff --git a/src/user-guide/src/docbkx/user-guide.xml b/src/user-guide/src/docbkx/user-guide.xml index c1cbbeb..6fcd89b 100644 --- a/src/user-guide/src/docbkx/user-guide.xml +++ b/src/user-guide/src/docbkx/user-guide.xml @@ -30,16 +30,12 @@ - Mirantis, Inc. + - - 2013 - Mirantis, Inc. - - v0.1 - Murano™ - 2013-09-04 + v0.2 + Murano + 2013-09-09 Copyright details are filled in by the template. Change