Merge "Use HostAddressOpt for opts that accept IP and hostnames"

ceilometer/collector.py

@@ -32,10 +32,10 @@ from ceilometer.publisher import utils as publisher_utils
 from ceilometer import utils
 
 OPTS = [
-    cfg.StrOpt('udp_address',
-               default='0.0.0.0',
-               help='Address to which the UDP socket is bound. Set to '
-               'an empty string to disable.'),
+    cfg.HostAddressOpt('udp_address',
+                       default='0.0.0.0',
+                       help='Address to which the UDP socket is bound. Set to '
+                       'an empty string to disable.'),
     cfg.PortOpt('udp_port',
                 default=4952,
                 help='Port to which the UDP socket is bound.'),

ceilometer/compute/virt/vmware/inspector.py

@@ -29,9 +29,9 @@ opt_group = cfg.OptGroup(name='vmware',
                          title='Options for VMware')
 
 OPTS = [
-    cfg.StrOpt('host_ip',
-               default='',
-               help='IP address of the VMware vSphere host.'),
+    cfg.HostAddressOpt('host_ip',
+                       default='127.0.0.1',
+                       help='IP address of the VMware vSphere host.'),
     cfg.PortOpt('host_port',
                 default=443,
                 help='Port of the VMware vSphere host.'),

ceilometer/opts.py

@@ -57,12 +57,13 @@ import ceilometer.volume.discovery
 
 
 OPTS = [
-    cfg.StrOpt('host',
-               default=socket.gethostname(),
-               sample_default='<your_hostname>',
-               help='Name of this node, which must be valid in an AMQP '
-               'key. Can be an opaque identifier. For ZeroMQ only, must '
-               'be a valid host name, FQDN, or IP address.'),
+    cfg.HostAddressOpt('host',
+                       default=socket.gethostname(),
+                       sample_default='<your_hostname>',
+                       help='Name of this node, which must be valid in an '
+                       'AMQP key. Can be an opaque identifier. For ZeroMQ '
+                       'only, must be a valid host name, FQDN, or IP '
+                       'address.'),
     cfg.IntOpt('http_timeout',
                default=600,
                help='Timeout seconds for HTTP requests. Set it to None to '

requirements.txt

@@ -14,7 +14,7 @@ keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
 lxml>=2.3 # BSD
 msgpack-python>=0.4.0 # Apache-2.0
 oslo.concurrency>=3.5.0 # Apache-2.0
-oslo.config>=3.9.0 # Apache-2.0
+oslo.config>=3.22.0 # Apache-2.0
 oslo.db>=4.1.0 # Apache-2.0
 oslo.i18n>=2.1.0 # Apache-2.0
 oslo.log>=1.14.0 # Apache-2.0