From 92b2f33b687f1afb5b3acc85b96c5b57ae5ba49c Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 29 May 2017 17:16:42 +0200 Subject: [PATCH] Switch to "ipmi" hardware type by default for >= Pike This is a new-style ironic driver that is functionally equivalent to older pxe_ipmitool. It also allows a few optional features, like changing deploy method on fly. Related to blueprint ironic-driver-composition Change-Id: I02993864136db2b5c67bdc5ecf42158b8e023503 --- releasenotes/notes/ipmi-hw-type-dd4397735dbc2152.yaml | 5 +++++ roles/libvirt/setup/overcloud/templates/instackenv.json.j2 | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/ipmi-hw-type-dd4397735dbc2152.yaml diff --git a/releasenotes/notes/ipmi-hw-type-dd4397735dbc2152.yaml b/releasenotes/notes/ipmi-hw-type-dd4397735dbc2152.yaml new file mode 100644 index 000000000..fb251a407 --- /dev/null +++ b/releasenotes/notes/ipmi-hw-type-dd4397735dbc2152.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Starting with the Pike release, the ``ipmi`` hardware type is used for + virtual nodes instead of the old ``pxe_ipmitool`` driver. diff --git a/roles/libvirt/setup/overcloud/templates/instackenv.json.j2 b/roles/libvirt/setup/overcloud/templates/instackenv.json.j2 index 111fe8c1f..e1ddafcd8 100644 --- a/roles/libvirt/setup/overcloud/templates/instackenv.json.j2 +++ b/roles/libvirt/setup/overcloud/templates/instackenv.json.j2 @@ -13,7 +13,11 @@ "pm_addr": "{{ host_ip }}", {% else %} "pm_password": "password", - "pm_type": "pxe_ipmitool", + {% if release == 'ocata' %} + "pm_type": "pxe_ipmitool", + {% else %} + "pm_type": "ipmi", + {% endif %} "pm_user": "admin", "pm_addr": "127.0.0.1", "pm_port": "{{ node.virtualbmc_port }}",