From aeef10945dedaaf48e638771a76bde160466eabd Mon Sep 17 00:00:00 2001
From: zhurong <aaronzhu1121@gmail.com>
Date: Mon, 17 Jan 2022 03:00:37 +0000
Subject: [PATCH] Update the murano.conf

Change-Id: I0a7acd64e8361bce3b318a6c5046a575925deb4a
---
 doc/source/install/from-source.rst | 25 ++++++++++---------------
 doc/source/install/install-api.rst | 22 +++++++++-------------
 2 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/doc/source/install/from-source.rst b/doc/source/install/from-source.rst
index f7e6e3034..df9b4f9fb 100644
--- a/doc/source/install/from-source.rst
+++ b/doc/source/install/from-source.rst
@@ -58,33 +58,28 @@ Install the API service and Engine
         [DEFAULT]
         debug = true
         verbose = true
-        rabbit_host = %RABBITMQ_SERVER_IP%
-        rabbit_userid = %RABBITMQ_USER%
-        rabbit_password = %RABBITMQ_PASSWORD%
-        rabbit_virtual_host = %RABBITMQ_SERVER_VIRTUAL_HOST%
-        driver = messagingv2
+        transport_url = rabbit://%RABBITMQ_USER%:%RABBITMQ_PASSWORD%@%RABBITMQ_SERVER_IP%:5672/
 
         ...
 
         [database]
-        backend = sqlalchemy
-        connection = sqlite:///murano.sqlite
+        connection = mysql+pymysql://murano:MURANO_DBPASS@controller/murano
 
         ...
 
         [keystone]
-        auth_url = 'http://%OPENSTACK_HOST_IP%:5000/v2.0'
+        auth_url = http://%OPENSTACK_KEYSTONE_ENDPOINT%
 
         ...
 
         [keystone_authtoken]
-        www_authenticate_uri = 'http://%OPENSTACK_HOST_IP%:5000/v2.0'
-        auth_host = '%OPENSTACK_HOST_IP%'
-        auth_port = 5000
-        auth_protocol = http
-        admin_tenant_name = %OPENSTACK_ADMIN_TENANT%
-        admin_user = %OPENSTACK_ADMIN_USER%
-        admin_password = %OPENSTACK_ADMIN_PASSWORD%
+        project_domain_name = Default
+        project_name = %OPENSTACK_ADMIN_PROJECT%
+        user_domain_name = Default
+        password = %OPENSTACK_ADMIN_PASSWORD%
+        username = %OPENSTACK_ADMIN_USER%
+        auth_url = http://%OPENSTACK_KEYSTONE_ENDPOINT%
+        auth_type = password
 
         ...
 
diff --git a/doc/source/install/install-api.rst b/doc/source/install/install-api.rst
index f042cad69..097b3c1d0 100644
--- a/doc/source/install/install-api.rst
+++ b/doc/source/install/install-api.rst
@@ -46,11 +46,7 @@ Install and configure components
         [DEFAULT]
         debug = true
         verbose = true
-        rabbit_host = %RABBITMQ_SERVER_IP%
-        rabbit_userid = %RABBITMQ_USER%
-        rabbit_password = %RABBITMQ_PASSWORD%
-        rabbit_virtual_host = %RABBITMQ_SERVER_VIRTUAL_HOST%
-        driver = messagingv2
+        transport_url = rabbit://%RABBITMQ_USER%:%RABBITMQ_PASSWORD%@%RABBITMQ_SERVER_IP%:5672/
 
         ...
 
@@ -60,18 +56,18 @@ Install and configure components
         ...
 
         [keystone]
-        auth_url = 'http://%OPENSTACK_HOST_IP%:5000/v2.0'
+        auth_url = http://%OPENSTACK_KEYSTONE_ENDPOINT%
 
         ...
 
         [keystone_authtoken]
-        www_authenticate_uri = 'http://%OPENSTACK_HOST_IP%:5000/v2.0'
-        auth_host = '%OPENSTACK_HOST_IP%'
-        auth_port = 5000
-        auth_protocol = http
-        admin_tenant_name = %OPENSTACK_ADMIN_TENANT%
-        admin_user = %OPENSTACK_ADMIN_USER%
-        admin_password = %OPENSTACK_ADMIN_PASSWORD%
+        project_domain_name = Default
+        project_name = %OPENSTACK_ADMIN_PROJECT%
+        user_domain_name = Default
+        password = %OPENSTACK_ADMIN_PASSWORD%
+        username = %OPENSTACK_ADMIN_USER%
+        auth_url = http://%OPENSTACK_KEYSTONE_ENDPOINT%
+        auth_type = password
 
         ...