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..a032d32 100644 --- a/src/getting-started/src/docbkx/content/setup_devbox.xml +++ b/src/getting-started/src/docbkx/content/setup_devbox.xml @@ -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 - - - - on CentOS + + + CentOS + + +># murano-conductor/setup-centos.sh install + - -># 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,31 +365,31 @@ 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 - on CentOS + CentOS ># 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..5c66121 100644 --- a/src/getting-started/src/docbkx/content/setup_lab_environment.xml +++ b/src/getting-started/src/docbkx/content/setup_lab_environment.xml @@ -187,8 +187,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 +283,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: @@ -382,24 +429,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/user-guide/src/docbkx/content/murano-dashboard.xml b/src/user-guide/src/docbkx/content/murano-dashboard.xml index 6403e58..29d37eb 100644 --- a/src/user-guide/src/docbkx/content/murano-dashboard.xml +++ b/src/user-guide/src/docbkx/content/murano-dashboard.xml @@ -51,7 +51,7 @@ 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 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;