From ee6d1a7a49ceee28af4ca752a992f908ddea83f4 Mon Sep 17 00:00:00 2001
From: "zhu.boxiang" <zhu.boxiang@99cloud.net>
Date: Fri, 27 May 2022 11:11:34 +0800
Subject: [PATCH] fix: Add manila into service mapping

Add manila into service mapping. So if we deployed the
manila service, we can get the endpoint of it by default.
Re-sort the service mapping by its' initial.

Change-Id: I88dbafbe34b0e95eff0b00d9260f1b7a6fc0db77
---
 etc/skyline.yaml.sample               |  1 +
 skyline_apiserver/config/openstack.py | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/etc/skyline.yaml.sample b/etc/skyline.yaml.sample
index 4241fe4..cd4fbfc 100644
--- a/etc/skyline.yaml.sample
+++ b/etc/skyline.yaml.sample
@@ -81,6 +81,7 @@ openstack:
     object-store: swift
     orchestration: heat
     placement: placement
+    sharev2: manilav2
     volumev3: cinder
   system_admin_roles:
   - admin
diff --git a/skyline_apiserver/config/openstack.py b/skyline_apiserver/config/openstack.py
index 577d099..bc210f6 100644
--- a/skyline_apiserver/config/openstack.py
+++ b/skyline_apiserver/config/openstack.py
@@ -166,18 +166,19 @@ service_mapping = Opt(
     ),
     schema=Dict[StrictStr, StrictStr],
     default={
-        "volumev3": "cinder",
-        "image": "glance",
-        "orchestration": "heat",
-        "identity": "keystone",
-        "network": "neutron",
-        "compute": "nova",
-        "placement": "placement",
         "baremetal": "ironic",
-        "load-balancer": "octavia",
-        "object-store": "swift",
-        "database": "trove",
+        "compute": "nova",
         "container-infra": "magnum",
+        "database": "trove",
+        "identity": "keystone",
+        "image": "glance",
+        "load-balancer": "octavia",
+        "network": "neutron",
+        "object-store": "swift",
+        "orchestration": "heat",
+        "placement": "placement",
+        "volumev3": "cinder",
+        "sharev2": "manilav2",
     },
 )