From c604ca4d35b31cd009c02a152b42bc442b8d5e05 Mon Sep 17 00:00:00 2001
From: "ChangBo Guo(gcb)" <eric.guo@easystack.cn>
Date: Sun, 4 May 2014 11:17:11 +0800
Subject: [PATCH] Clean up openstack-common.conf

oslo-incubator will introduce new integrity check in [1].
That will help developer find inconsistent issue while copying
from oslo-incubator. The check just outputs warnings. These are
changes according to warning:
 * sort the modules in openstack-common.conf
 * Fix wrong module names

[1] https://review.openstack.org/#/c/76901/

Change-Id: Ie939d46a72732357acc9dab03c0682b0e271a7ed
Related-Bug: #1295582
---
 openstack-common.conf | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openstack-common.conf b/openstack-common.conf
index 565888c27764..36a9ad2896e3 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 
-# The list of modules to copy from oslo-incubator.git
+# The list of modules to copy from oslo-incubator
 module=cliutils
 module=config
 module=context
@@ -20,8 +20,7 @@ module=lockutils
 module=log
 module=loopingcall
 module=memorycache
-module=middleware/base
-module=middleware/request_id
+module=middleware
 module=network_utils
 module=periodic_task
 module=policy
@@ -30,9 +29,9 @@ module=report
 module=report.generators
 module=report.models
 module=report.views
-module=report.views.xml
 module=report.views.json
 module=report.views.text
+module=report.views.xml
 module=service
 module=sslutils
 module=strutils