From 8afacd75512ea587027b15ee034965d2d07250f2 Mon Sep 17 00:00:00 2001
From: Benedikt Trefzer <benedikt.trefzer@cirrax.com>
Date: Sat, 9 Sep 2017 14:47:03 +0200
Subject: [PATCH] change libvirt package name on debian stretch and up

the package libvirt-bin does not exist anymore on debian
stretch and newer.

Change-Id: Id1f0fdd328f927d583e2efe36baa8e520cbc2988
---
 manifests/params.pp                        | 6 +++++-
 spec/classes/nova_serial_proxy_spec.rb     | 5 +++--
 spec/classes/nova_spicehtml5_proxy_spec.rb | 7 ++++---
 spec/classes/nova_vnc_proxy_spec.rb        | 7 ++++---
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 663268766..c55b6f2d6 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -81,7 +81,11 @@ class nova::params {
       $conductor_package_name       = 'nova-conductor'
       $consoleauth_package_name     = 'nova-consoleauth'
       $doc_package_name             = 'nova-doc'
-      $libvirt_package_name         = 'libvirt-bin'
+      if ($::operatingsystem == 'Debian') and (versioncmp($::operatingsystemmajrelease, '9') >= 0 ) {
+        $libvirt_package_name         = 'libvirt-daemon-system'
+      } else {
+        $libvirt_package_name         = 'libvirt-bin'
+      }
       $network_package_name         = 'nova-network'
       $scheduler_package_name       = 'nova-scheduler'
       $tgt_package_name             = 'tgt'
diff --git a/spec/classes/nova_serial_proxy_spec.rb b/spec/classes/nova_serial_proxy_spec.rb
index 95bfcc22a..50b82d66d 100644
--- a/spec/classes/nova_serial_proxy_spec.rb
+++ b/spec/classes/nova_serial_proxy_spec.rb
@@ -67,8 +67,9 @@ describe 'nova::serialproxy' do
   context 'on Debian system' do
     let :facts do
      @default_facts.merge({
-       :osfamily        => 'Debian',
-        :operatingsystem => 'Debian'
+       :osfamily                  => 'Debian',
+       :operatingsystem           => 'Debian',
+       :operatingsystemmajrelease => '9'
       })
     end
 
diff --git a/spec/classes/nova_spicehtml5_proxy_spec.rb b/spec/classes/nova_spicehtml5_proxy_spec.rb
index 1681202a7..dd81201a9 100644
--- a/spec/classes/nova_spicehtml5_proxy_spec.rb
+++ b/spec/classes/nova_spicehtml5_proxy_spec.rb
@@ -64,9 +64,10 @@ describe 'nova::spicehtml5proxy' do
   context 'on Debian system' do
     let :facts do
       @default_facts.merge({
-        :osfamily        => 'Debian',
-        :operatingsystem => 'Debian',
-        :os_package_type => 'debian'
+        :osfamily                  => 'Debian',
+        :operatingsystem           => 'Debian',
+        :operatingsystemmajrelease => '9',
+        :os_package_type           => 'debian'
       })
     end
 
diff --git a/spec/classes/nova_vnc_proxy_spec.rb b/spec/classes/nova_vnc_proxy_spec.rb
index a73930521..a1537c5a9 100644
--- a/spec/classes/nova_vnc_proxy_spec.rb
+++ b/spec/classes/nova_vnc_proxy_spec.rb
@@ -49,9 +49,10 @@ describe 'nova::vncproxy' do
   describe 'on debian OS' do
       let :facts do
         @default_facts.merge({
-          :osfamily        => 'Debian',
-          :operatingsystem => 'Debian',
-          :os_package_type => 'debian'
+          :osfamily                  => 'Debian',
+          :operatingsystem           => 'Debian',
+          :operatingsystemmajrelease => '9',
+          :os_package_type           => 'debian'
         })
       end
       it { is_expected.to contain_package('nova-vncproxy').with(