diff --git a/src/getting-started/src/docbkx/content/overview.xml b/src/getting-started/src/docbkx/content/overview.xml index 80fcc7a..2a8081e 100644 --- a/src/getting-started/src/docbkx/content/overview.xml +++ b/src/getting-started/src/docbkx/content/overview.xml @@ -23,42 +23,54 @@ version="5.0"> About Murano - Murano is a new service which allows a non-experienced user to deploy - reliable Windows based environments in OpenStack with the "One Click". The - key goal is to provide a UI and API enabling the deployment and - operation of Windows Environments at the Windows Services abstraction - level. The service is able to orchestrate complex circular dependent - cases in order to set up a complex Windows Environment with multiple - dependant services. + Murano Project introduces an application catalog, which allows application developers + and cloud administrators to publish various cloud-ready applications in a browsable + categorised catalog, which may be used by the cloud users (including the unexperienced ones) + to pick-up the needed applications and services and composes the reliable environments out of + them in a “push-the-button” manner. Key goal is to provide UI and API which allows to compose + and deploy composite environments on the Application abstraction level and then manage their + lifecycle. The Service should be able to orchestrate complex circular dependent cases in order + to setup complete environments with many dependant applications and services. However, the + actual deployment itself will be done by the existing software orchestration tools (such as Heat), + while the Murano project will become an integration point for various applications and services. The service addresses following use cases: - Self-deploying of predefined Windows services with their dependencies + Self-deploying of predefined Services with their dependencies Automation of administrative tasks during data center roll-out - Custom windows application as a windows service + Custom windows application as a Windows Service + + + Custom linux application as a Linux Service - The solution provides higher level of abstraction for manipulation - Windows Environments. Key concepts are: + The solution provides higher level of abstraction for manipulation applications. Key concepts are: Windows Service - a service such as Active Directory, MsSQL, or IIS, which usually consists of multiple virtual machines (VM) and has multiple dependencies. - - Windows Environment - a logical unit for all Services and represents a classical Windows Datacenter. + + Linux Service - a service such as Apache Server can be easily preconfigured and installed in 1-Click - Windows VM instance - a VM which hosts a Windows Service. A Windows Service might be deployed over several Windows VM instances. + Environment - a logical unit for one or several Services. + + + + VM instance - a VM which hosts a Service. A Service might be deployed over several VM instances. + + + Metadata Service - Service that provides opportunity to manage custom services definitions. @@ -75,7 +87,7 @@ Supports Availability Zones and Disaster Recovery scenarios - Uses native Windows features for High Availabillity (HA) solutions + Uses native Windows features for High Availability (HA) solutions @@ -92,8 +104,8 @@ - September. 4, 2013 - Release-0.2 + September. 4, 2013 + Release-0.2 @@ -102,6 +114,17 @@ + + December. 9, 2013 + Release-0.4 + + + + Update with Release-0.4 information + + + + diff --git a/src/getting-started/src/docbkx/content/setup_devbox.xml b/src/getting-started/src/docbkx/content/setup_devbox.xml index 8f3b945..8917aed 100644 --- a/src/getting-started/src/docbkx/content/setup_devbox.xml +++ b/src/getting-started/src/docbkx/content/setup_devbox.xml @@ -92,7 +92,7 @@ ># cd murano-deployment/getting-started -># git checkout -b release-0.2 origin/release-0.2 +># git checkout -b release-0.4 origin/release-0.4 @@ -149,11 +149,11 @@ LAB_HOST='***.***.***.***' - Clone murano-deployment repository from branch release-0.2: + Clone murano-deployment repository from branch release-0.4: -># git clone git://github.com/stackforge/murano-deployment.git -b release-0.2 +># git clone git://github.com/stackforge/murano-deployment.git -b release-0.4 @@ -171,20 +171,35 @@ LAB_HOST='***.***.***.***' -LAB_HOST='***.***.***.***' +LAB_HOST='' -AUTH_URL="http://$LAB_HOST:5000/v2.0" +ADMIN_USER='' +ADMIN_PASSWORD='' -ADMIN_USER='admin' -ADMIN_PASSWORD='***' +RABBITMQ_LOGIN='' +RABBITMQ_PASSWORD='' +RABBITMQ_VHOST='' +RABBITMQ_PORT='' -RABBITMQ_LOGIN='muranouser' -RABBITMQ_PASSWORD='murano' -RABBITMQ_VHOST='muranovhost' -RABBITMQ_PORT='****' -BRANCH_NAME='release-0.3' +# Equals to LAB_HOST by default +#RABBITMQ_HOST='' +#RABBITMQ_HOST_ALT='' +#FILE_SHARE_HOST='' + +BRANCH_NAME='release-0.4' + +# Only 'true' or 'false' values are allowed! SSL_ENABLED='false' +SSL_CA_FILE='' +SSL_CERT_FILE='' +SSL_KEY_FILE='' + +#BRANCH_MURANO_API='' +#BRANCH_MURANO_DASHBOARD='' +#BRANCH_MURANO_CLIENT='' +#BRANCH_MURANO_CONDUCTOR='' +#BRANCH_MURANO_REPOSITORY='' It's recommended to use separate vHost in RabbitMQ. Then some additional system packages will be installed. 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 7c37f19..1d420ec 100644 --- a/src/getting-started/src/docbkx/content/setup_lab_environment.xml +++ b/src/getting-started/src/docbkx/content/setup_lab_environment.xml @@ -472,11 +472,11 @@
Keystone Configuration Notes - Service entry for murano-api and endpoint associated with it + Service entry and endpoint associated with it for murano-api and murano-repository could also be configured in the keystone. If there is no record about murano-api in the keystone murano-dashboard would try to reach murano-api service at localhost on the default murano-api - port 8082. + port 8082.(8084 in case of murano-repository) How to add service record into the keystone using python keystone client: @@ -484,6 +484,11 @@ ># keystone service-create --name muranoapi --type murano \ --description "Murano-Api Service" + And for murano-repository: + +># keystone service-create --name murano-repository --type murano-repository \ + --description "Murano-Repository Service" + This command returns UUID of the created service record, which should be used below. diff --git a/src/getting-started/src/docbkx/content/troubleshooting.xml b/src/getting-started/src/docbkx/content/troubleshooting.xml index 0455ccc..b256594 100644 --- a/src/getting-started/src/docbkx/content/troubleshooting.xml +++ b/src/getting-started/src/docbkx/content/troubleshooting.xml @@ -129,10 +129,16 @@ Murano Log Files - /var/log/murano-api.log + /var/log/murano/murano-api.log - /var/log/murano-conductor.log + /var/log/murano/murano-conductor.log + + + /var/log/murano/murano-dashboard.log + + + /var/log/murano/murano-repository.log /var/log/apache2/errors.log @@ -142,7 +148,7 @@ /var/log/httpd/errors.log - Windows Log Files + Windows Log Files (on VM's) C:\Murano\PowerShell.log @@ -152,4 +158,4 @@
- \ No newline at end of file +