diff --git a/src/administrators-guide/src/docbkx/content/installation-guide.xml b/src/administrators-guide/src/docbkx/content/installation-guide.xml index a52f961..3173b6a 100644 --- a/src/administrators-guide/src/docbkx/content/installation-guide.xml +++ b/src/administrators-guide/src/docbkx/content/installation-guide.xml @@ -333,13 +333,13 @@ sudo su - git clone https://github.com/stackforge/murano-api ]]> - Stable version one of our releases can be checked by tag: + Stable version one of our releases can be checked by the tag: cd murano-api && git checkout 0.2 - Switch to just created directory and then perform installation + And perform installation: Ubuntu @@ -385,7 +385,7 @@ cp murano-api-paste.ini.sample murano-api-paste.ini - Configure murano-api.conf it according to your environment: + Configure murano-api.conf it according to your environment: [DEFAULT] section sets up logging. @@ -413,34 +413,18 @@ rabbitmqctl set_permissions -p muranovhost muranouser ".*" ".*" ".*" - In [filter:authtoken] - configure keystone auth_token. For more information see + In [keystone_authtoken] + configure parameters of Openstack Keystone service. For more information see Auth-Token Middleware with Username and Password - - Update configuration in /etc/murano-api/murano-api-paste.ini - : - -... -[filter.authtoken] -... -# auth_host should point to the host where Keyston servive is installed -auth_host = -... -# For auth_protocol use 'http' in general and 'https' if Keystone supports SSL. -auth_protocol = http -# A name for OpenStack admin tenant name ('admin' by default) -admin_tenant_name = admin -# A name for OpenStack admin user ('admin' by default) -admin_user = admin -# A pasword for admin user -admin_password = -... - + + Another murano-api configuration file located at + /etc/murano-api/murano-api-paste.ini and does + not require any changes. @@ -550,7 +534,7 @@ cd murano-conductor && git checkout 0.2 - Switch to just created directory and then perform installation + And then perform installation Ubuntu @@ -828,7 +812,7 @@ sh setup-centos.sh install HTTPS for Murano API SSL for Murano API service can be configured in ssl section in - /etc/murano-api/murano-api.conf. Just point to a valid SSL certificate. + /etc/murano-api/murano-api.conf. Just point to a valid SSL certificate. See the example below: @@ -880,15 +864,14 @@ ca_file = PATH default all messages in Rabbit MQ are not encrypted. Each RabbitMQ Exchange should be configured separately. -
- Murano API -> Rabbit MQ exchange - - Edit rabbitmq section in /etc/murano-api/murano-api.conf - and set ssl option to True to enable SSL. Specify the path to the - SSL CA certificate in regular format: /path/to/file without quotes or leave it empty to allow - self-signed certificates. - - + Murano API -> Rabbit MQ exchange + + Edit rabbitmq section in /etc/murano-api/murano-api.conf + and set ssl option to True to enable SSL. Specify the path to the + SSL CA certificate in regular format: /path/to/file without quotes or leave it empty to allow + self-signed certificates. + + - -
-
- Rabbit MQ -> Murano Conductor exchange + + Rabbit MQ -> Murano Conductor exchange Open /etc/murano-conductor/conductor.conf and configure rabbitmq section in the same way: @@ -919,16 +900,16 @@ ssl = True ca_certs = /home/user/certificates/example.crt ]]> -
-
- Murano Agent -> Rabbit MQ exchange - - By default all Murano Conductor configuration settings apply to Murano Agent. - If you want to configure Murano Agent in a different way change the default template. It can be found - here:/etc/murano-conductor/data/templates/agent-config/Default.template. - Take a look at appSettings section: - - + + Murano Agent -> Rabbit MQ exchange + + + By default all Murano Conductor configuration settings apply to Murano Agent. + If you want to configure Murano Agent in a different way change the default template. It can be found + here:/etc/murano-conductor/data/templates/agent-config/Default.template. + Take a look at appSettings section: + + @@ -949,16 +930,23 @@ ca_certs = /home/user/certificates/example.crt ]]> - + + + Desired parameter should be set directly to the value of the key + that you want to change. Quotes are need to be kept. + Thus you can change "rabbitmq.ssl" and "rabbitmq.port" values to + make Rabbit MQ work with this exchange in a different from + Murano-Conductor way. + +
+
+ SSL for Murano Dashboard - Desired parameter should be set directly to the value of the key - that you want to change. Quotes are need to be kept. - Thus you can change "rabbitmq.ssl" and "rabbitmq.port" values to - make Rabbit MQ work with this exchange in a different from - Murano-Conductor way. + If you are going not to use self-signed certificates additional configuration do not need to be done. + Just point https in the URL. Otherwise, set MURANO_API_INSECURE = True on horizon config. + You can find it in /etc/openstack-dashboard/local_settings.py..
-