From b698435c45eb41b47d5f1fe4ef3abc34c80a3722 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 26 Jun 2018 15:19:27 +0200 Subject: [PATCH] Stop enabling the ironic's pxe_ipmitool driver Both the driver and the enabled_drivers options are being removed this week. Stop setting them to avoid breakages. Change-Id: I0e0bf851424b8f5839b159ef83f1cc65c30e2fb3 --- ansible/roles/ironic/templates/ironic.conf.j2 | 2 -- doc/source/reference/bifrost.rst | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2 index d468af7f80..b8f71897c8 100644 --- a/ansible/roles/ironic/templates/ironic.conf.j2 +++ b/ansible/roles/ironic/templates/ironic.conf.j2 @@ -13,8 +13,6 @@ debug = {{ ironic_logging_debug }} log_dir = /var/log/kolla/ironic -enabled_drivers = pxe_ipmitool - transport_url = {{ rpc_transport_url }} [oslo_messaging_notifications] diff --git a/doc/source/reference/bifrost.rst b/doc/source/reference/bifrost.rst index dab76bb697..ea45708563 100644 --- a/doc/source/reference/bifrost.rst +++ b/doc/source/reference/bifrost.rst @@ -237,7 +237,7 @@ used to populate Ironic. See the `bifrost dynamic inventory examples further details. For example, the following inventory defines a single node managed via the -Ironic ``agent_ipmitool`` driver. The inventory contains credentials required +Ironic ``ipmi`` driver. The inventory contains credentials required to access the node's BMC via IPMI, the MAC addresses of the node's NICs, an IP address to configure the node's configdrive with, a set of scheduling properties and a logical name. @@ -257,7 +257,7 @@ properties and a logical name. mac: "1c:c1:de:1c:aa:53" - mac: "1c:c1:de:1c:aa:52" - driver: "agent_ipmitool" + driver: "ipmi" ipv4_address: "192.168.1.10" properties: cpu_arch: "x86_64" @@ -281,7 +281,7 @@ For details on bifrost's variables see the bifrost documentation. For example: mysql_service_name: mysql ansible_python_interpreter: /var/lib/kolla/venv/bin/python - enabled_drivers: agent_ipmitool,agent_ipminative + enabled_hardware_types: ipmi # uncomment below if needed # dhcp_pool_start: 192.168.2.200 # dhcp_pool_end: 192.168.2.250