Merge "change libvirt package name on debian stretch and up"

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'

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
 

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
 

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(