From d29754feea21e3311831da5e324c2950b6856bae Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Sat, 31 Aug 2019 11:10:03 +0800
Subject: [PATCH] fix: 1. glance/keystone version handler fix 2. allow run
 glance as normal user

---
 pkg/image/service/handlers.go    |  3 +++
 pkg/image/service/service.go     | 10 +++++-----
 pkg/keystone/service/handlers.go |  3 +++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkg/image/service/handlers.go b/pkg/image/service/handlers.go
index a5efa9779a..4559b7d557 100644
--- a/pkg/image/service/handlers.go
+++ b/pkg/image/service/handlers.go
@@ -31,6 +31,9 @@ const (
 func initHandlers(app *appsrv.Application) {
 	db.InitAllManagers()
 
+	// add version handler with API_VERSION prefix
+	app.AddDefaultHandler("GET", API_VERSION+"/version", appsrv.VersionHandler, "version")
+
 	db.RegistUserCredCacheUpdater()
 
 	db.AddProjectResourceCountHandler(API_VERSION, app)
diff --git a/pkg/image/service/service.go b/pkg/image/service/service.go
index 0d7905bee2..75215a4f97 100644
--- a/pkg/image/service/service.go
+++ b/pkg/image/service/service.go
@@ -35,7 +35,6 @@ import (
 	_ "yunion.io/x/onecloud/pkg/image/tasks"
 	"yunion.io/x/onecloud/pkg/image/torrent"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
-	"yunion.io/x/onecloud/pkg/util/sysutils"
 )
 
 func StartService() {
@@ -45,10 +44,11 @@ func StartService() {
 	dbOpts := &opts.DBOptions
 	common_options.ParseOptions(opts, os.Args, "glance-api.conf", api.SERVICE_TYPE)
 
-	isRoot := sysutils.IsRootPermission()
-	if !isRoot {
-		log.Fatalf("glance service must running with root permissions")
-	}
+	// no need to run glance as root any more
+	// isRoot := sysutils.IsRootPermission()
+	// if !isRoot {
+	// 	log.Fatalf("glance service must running with root permissions")
+	// }
 
 	if opts.PortV2 > 0 {
 		log.Infof("Port V2 %d is specified, use v2 port", opts.PortV2)
diff --git a/pkg/keystone/service/handlers.go b/pkg/keystone/service/handlers.go
index eae1614132..75fa145292 100644
--- a/pkg/keystone/service/handlers.go
+++ b/pkg/keystone/service/handlers.go
@@ -31,6 +31,9 @@ const (
 func initHandlers(app *appsrv.Application) {
 	db.InitAllManagers()
 
+	// add version handler with API_VERSION prefix
+	app.AddDefaultHandler("GET", API_VERSION+"/version", appsrv.VersionHandler, "version")
+
 	// quotas.AddQuotaHandler(models.QuotaManager, API_VERSION, app)
 	usages.AddUsageHandler(API_VERSION, app)
 	taskman.AddTaskHandler(API_VERSION, app)