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'
+      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

@@ -68,7 +68,8 @@ describe 'nova::serialproxy' do
     let :facts do
      @default_facts.merge({
        :osfamily                  => 'Debian',
-        :operatingsystem => 'Debian'
+       :operatingsystem           => 'Debian',
+       :operatingsystemmajrelease => '9'
       })
     end
 

spec/classes/nova_spicehtml5_proxy_spec.rb

@@ -66,6 +66,7 @@ describe 'nova::spicehtml5proxy' do
       @default_facts.merge({
         :osfamily                  => 'Debian',
         :operatingsystem           => 'Debian',
+        :operatingsystemmajrelease => '9',
         :os_package_type           => 'debian'
       })
     end

spec/classes/nova_vnc_proxy_spec.rb

@@ -51,6 +51,7 @@ describe 'nova::vncproxy' do
         @default_facts.merge({
           :osfamily                  => 'Debian',
           :operatingsystem           => 'Debian',
+          :operatingsystemmajrelease => '9',
           :os_package_type           => 'debian'
         })
       end