From 37a0cacf267a5c8e48cbe7eeb79a0b94839d8f0b Mon Sep 17 00:00:00 2001
From: "zhu.boxiang" <zhu.boxiang@99cloud.net>
Date: Thu, 26 May 2022 20:19:51 +0800
Subject: [PATCH] style: Re-generate the default config yaml

Re-generate the default config yaml.

Change-Id: I4b536694ae311308cdc9b3a43b32c146613daf18
---
 etc/skyline.yaml.sample             | 17 ++++++++---------
 skyline_apiserver/config/default.py |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/etc/skyline.yaml.sample b/etc/skyline.yaml.sample
index 7ce5f3d..4241fe4 100644
--- a/etc/skyline.yaml.sample
+++ b/etc/skyline.yaml.sample
@@ -2,8 +2,7 @@ default:
   access_token_expire: 3600
   access_token_renew: 1800
   cors_allow_origins: []
-  database_url: 'mysql://root:root@localhost:3306/skyline'
-  # database_url: 'sqlite:////tmp/skyline.db'
+  database_url: sqlite:////tmp/skyline.db
   debug: false
   log_dir: ./log
   prometheus_basic_auth_password: ''
@@ -67,14 +66,14 @@ openstack:
     fwaas_v2: neutron_firewall
     vpnaas: neutron_vpn
   interface_type: public
-  keystone_url: 'http://localhost:5000/v3/'
+  keystone_url: http://localhost:5000/v3/
   nginx_prefix: /api/openstack
   reclaim_instance_interval: 604800
   service_mapping:
     baremetal: ironic
     compute: nova
-    database: trove
     container-infra: magnum
+    database: trove
     identity: keystone
     image: glance
     load-balancer: octavia
@@ -86,13 +85,13 @@ openstack:
   system_admin_roles:
   - admin
   - system_admin
-  system_project: 'service'
-  system_project_domain: 'Default'
+  system_project: service
+  system_project_domain: Default
   system_reader_roles:
   - system_reader
-  system_user_domain: 'Default'
-  system_user_name: 'skyline'
-  system_user_password: 'password'
+  system_user_domain: Default
+  system_user_name: skyline
+  system_user_password: password
 setting:
   base_settings:
   - flavor_families
diff --git a/skyline_apiserver/config/default.py b/skyline_apiserver/config/default.py
index 5b9b449..32f69d6 100644
--- a/skyline_apiserver/config/default.py
+++ b/skyline_apiserver/config/default.py
@@ -71,9 +71,9 @@ session_name = Opt(
 
 database_url = Opt(
     name="database_url",
-    description="Database url",
+    description="Database url. For mariadb, set as 'mysql://root:root@localhost:3306/skyline'",
     schema=StrictStr,
-    default="mysql://root:root@localhost:3306/skyline",
+    default="sqlite:////tmp/skyline.db",
 )
 
 prometheus_endpoint = Opt(