Merge "Ensure we install latest libivrt"

2017-04-21 15:12:22 +00:00 · 2017-04-21 15:12:22 +00:00 · 5475f9022a
commit 5475f9022a
parent d27eb6bce7 ab3982eb27
2 changed files with 5 additions and 1 deletions
--- a/devstack/files/debs/ironic
+++ b/devstack/files/debs/ironic
@ -18,7 +18,7 @@ ipxe
 gnupg
 libguestfs0
 libguestfs-tools
-libvirt-bin
+libvirt-bin # dist:xenial NOPRIME
 open-iscsi
 openssh-client
 pxelinux # dist:jessie,xenial
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@ -19,6 +19,10 @@ if is_service_enabled ir-api ir-cond; then
        # their dependencies have been installed

            echo_summary "Installing Ironic"
+            if ! is_service_enabled nova; then
+                source $RC_DIR/lib/nova_plugins/functions-libvirt
+                install_libvirt
+            fi
            install_ironic
            install_ironicclient
            cleanup_ironic_config_files