diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 9aaae0e67e..8714807e0c 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -192,9 +192,6 @@
 # IP address of this host. (string value)
 #my_ip=10.0.0.1
 
-# Use IPv6. (boolean value)
-#use_ipv6=false
-
 
 #
 # Options defined in ironic.api.app
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py
index 3e1d00296a..dc1d4e484c 100644
--- a/ironic/drivers/modules/pxe.py
+++ b/ironic/drivers/modules/pxe.py
@@ -90,7 +90,6 @@ LOG = logging.getLogger(__name__)
 
 CONF = cfg.CONF
 CONF.register_opts(pxe_opts, group='pxe')
-CONF.import_opt('use_ipv6', 'ironic.netconf')
 
 
 REQUIRED_PROPERTIES = {
diff --git a/ironic/netconf.py b/ironic/netconf.py
index fcea24c2d1..7018199b5a 100644
--- a/ironic/netconf.py
+++ b/ironic/netconf.py
@@ -44,9 +44,6 @@ netconf_opts = [
     cfg.StrOpt('my_ip',
                default=_get_my_ip(),
                help='IP address of this host.'),
-    cfg.BoolOpt('use_ipv6',
-                default=False,
-                help='Use IPv6.'),
 ]
 
 CONF.register_opts(netconf_opts)
diff --git a/ironic/tests/conf_fixture.py b/ironic/tests/conf_fixture.py
index a4e9de0511..f98d70c00a 100644
--- a/ironic/tests/conf_fixture.py
+++ b/ironic/tests/conf_fixture.py
@@ -20,7 +20,6 @@ from oslo.config import cfg
 from ironic.common import config
 
 CONF = cfg.CONF
-CONF.import_opt('use_ipv6', 'ironic.netconf')
 CONF.import_opt('host', 'ironic.common.service')
 
 
@@ -36,7 +35,6 @@ class ConfFixture(fixtures.Fixture):
         self.conf.set_default('host', 'fake-mini')
         self.conf.set_default('connection', "sqlite://", group='database')
         self.conf.set_default('sqlite_synchronous', False, group='database')
-        self.conf.set_default('use_ipv6', True)
         self.conf.set_default('verbose', True)
         config.parse_args([], default_config_files=[])
         self.addCleanup(self.conf.reset)