diff --git a/tacker/common/config.py b/tacker/common/config.py
index 9dbe4f755..65572f37d 100644
--- a/tacker/common/config.py
+++ b/tacker/common/config.py
@@ -53,18 +53,19 @@ core_opts = [
     cfg.BoolOpt('allow_sorting', default=False,
                 help=_("Allow the usage of the sorting")),
     cfg.StrOpt('pagination_max_limit', default="-1",
-               help=_("The maximum number of items returned in a single "
-                      "response, value was 'infinite' or negative integer "
-                      "means no limit")),
-    cfg.StrOpt('host', default=utils.get_hostname(),
-               help=_("The hostname Tacker is running on")),
+               help=_("The maximum number of items returned "
+                      "in a single response, value was 'infinite' "
+                      "or negative integer means no limit")),
+    cfg.HostAddressOpt('host', default=utils.get_hostname(),
+                       help=_("The hostname Tacker is running on")),
 ]
 
 core_cli_opts = [
     cfg.StrOpt('state_path',
                default='/var/lib/tacker',
                help=_("Where to store Tacker state files. "
-                      "This directory must be writable by the agent.")),
+                      "This directory must be writable by "
+                      "the agent.")),
 ]
 
 logging.register_options(cfg.CONF)