Merge "Switch to "ipmi" hardware type by default for >= Pike"

2017-06-23 17:05:08 +00:00 · 2017-06-23 17:05:08 +00:00 · d683de2d08
parent a57c82d2ea 92b2f33b68
commit d683de2d08
2 changed files with 10 additions and 1 deletions
--- a/releasenotes/notes/ipmi-hw-type-dd4397735dbc2152.yaml
+++ 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.
--- 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 }}",