From ec31d95b2159ec939ca0f8e96a9489bdbb2fe68d Mon Sep 17 00:00:00 2001
From: gordon chung <gord@live.ca>
Date: Tue, 27 Oct 2015 01:06:31 +0000
Subject: [PATCH] Revert "Use oslo_config PortOpt support"

This reverts commit 62ae26623fbf56259b260d318e4f6e27f32e91fe.

temporary action to unblock gate during summit

Change-Id: I63c183cb3c3dd759481c6a151090cbfda36e76b8
---
 aodh/api/__init__.py | 10 +++++-----
 requirements.txt     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aodh/api/__init__.py b/aodh/api/__init__.py
index 7c4a5424e..85655523e 100644
--- a/aodh/api/__init__.py
+++ b/aodh/api/__init__.py
@@ -17,11 +17,11 @@ from oslo_config import cfg
 
 # Register options for the service
 OPTS = [
-    cfg.PortOpt('port',
-                default=8042,
-                deprecated_group='DEFAULT',
-                help='The port for the aodh API server.',
-                ),
+    cfg.IntOpt('port',
+               default=8042,
+               deprecated_group='DEFAULT',
+               help='The port for the aodh API server.',
+               ),
     cfg.StrOpt('host',
                default='0.0.0.0',
                help='The listen IP for the aodh API server.',
diff --git a/requirements.txt b/requirements.txt
index 4ddffd1c5..746fd5698 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ keystonemiddleware>=2.2.0
 lxml>=2.3
 oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=1.12.0 # Apache-2.0
-oslo.config>=2.6.0 # Apache-2.0
+oslo.config>=1.15.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
 oslo.log>=1.2.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0