Merge "Use PortOpt type for port options"

example.conf

@@ -8,7 +8,9 @@
 # Deprecated group/name - [discoverd]/listen_address
 #listen_address = 0.0.0.0
 
-# Port to listen on. (integer value)
+# Port to listen on. (port value)
+# Minimum value: 0
+# Maximum value: 65535
 # Deprecated group/name - [discoverd]/listen_port
 #listen_port = 5050
 
@@ -528,7 +530,7 @@
 #user_id = <None>
 
 # Username (unknown value)
-# Deprecated group/name - [DEFAULT]/username
+# Deprecated group/name - [DEFAULT]/user-name
 #username = <None>
 
 
@@ -873,5 +875,5 @@
 #user_id = <None>
 
 # Username (unknown value)
-# Deprecated group/name - [DEFAULT]/username
+# Deprecated group/name - [DEFAULT]/user-name
 #username = <None>

ironic_inspector/conf.py

@@ -146,10 +146,10 @@ SERVICE_OPTS = [
                default='0.0.0.0',
                help='IP to listen on.',
                deprecated_group='discoverd'),
-    cfg.IntOpt('listen_port',
-               default=5050,
-               help='Port to listen on.',
-               deprecated_group='discoverd'),
+    cfg.PortOpt('listen_port',
+                default=5050,
+                help='Port to listen on.',
+                deprecated_group='discoverd'),
     cfg.StrOpt('auth_strategy',
                default='keystone',
                choices=('keystone', 'noauth'),