Merge pull request #685 from enovance/update-nova-cpu

Fix Live-migration & NFS support for nova-compute

.fixtures.yml

@@ -11,7 +11,7 @@ fixtures:
       ref: 'e381349c1b838301dd730aa3cd146ecacc75aa7c'
     'nova':
       repo: 'git://github.com/enovance/puppet-nova.git'
-      ref: 'ae171f93ed8dc60e6597ec03a7cfd7c7b70e65ed'
+      ref: '93a0c27ac9f4a4eeec761250838aae2e321eb1b1'
     'glance':
       repo: 'git://github.com/enovance/puppet-glance.git'
       ref: '78042d76c0854e16a55aaf05c03696d4d422e3c5'
@@ -155,7 +155,7 @@ fixtures:
       ref: '7122983d89bf68bc4170415cc03212f6a8a4636e'
     'nfs':
       repo: 'git://github.com/enovance/puppet-module-nfs.git'
-      ref: '65086bcc5fc5cd9ff617a425505326619a0887fc'
+      ref: '41ed7bda5ab385df6c27080d65d71ce0ba5decd2'
     'common':
       repo: 'git://github.com/enovance/puppet-module-common.git'
       ref: '2d0606fce1078222dd483e731ec32807f5b4ca53'

.travis.yml

@@ -5,7 +5,6 @@ rvm:
   - 2.0.0
 env:
   matrix:
-    - PUPPET_GEM_VERSION="~> 3.2.0"
     - PUPPET_GEM_VERSION="~> 3.6.0"
     - PUPPET_GEM_VERSION="~> 3.7.0"
 notifications:

Puppetfile

@@ -44,7 +44,7 @@ mod 'neutron',
   :ref => 'cefbdc897d70fd1c1fc44e372f05336674efd940'
 mod 'nova',
   :git => 'git://github.com/enovance/puppet-nova.git',
-  :ref => 'ae171f93ed8dc60e6597ec03a7cfd7c7b70e65ed'
+  :ref => '93a0c27ac9f4a4eeec761250838aae2e321eb1b1'
 mod 'swift',
   :git => 'git://github.com/enovance/puppet-swift.git',
   :ref => '3ea00440361ff2452561d2cce808d938e39cce56'
@@ -139,7 +139,7 @@ mod 'mysql',
 # https://github.com/ghoneycutt/puppet-module-nfs/pull/43 got merged.
 mod 'nfs',
   :git => 'git://github.com/enovance/puppet-module-nfs.git',
-  :ref => '65086bcc5fc5cd9ff617a425505326619a0887fc'
+  :ref => '41ed7bda5ab385df6c27080d65d71ce0ba5decd2'
 mod 'ntp',
   :git => 'git://github.com/enovance/puppetlabs-ntp.git',
   :ref => 'eb02ba2937ce86fb609ae41499767244b78ec58d'

manifests/compute/hypervisor.pp

@@ -86,9 +86,10 @@ class cloud::compute::hypervisor(
   $ks_spice_public_host       = false,
   # DEPRECATED
   $has_ceph                   = false
-) {
+) inherits cloud::params {
 
   include 'cloud::compute'
+  include 'cloud::params'
   include 'cloud::telemetry'
   include 'cloud::network'
   include 'cloud::network::vswitch'
@@ -325,7 +326,8 @@ Host *
     # Needed to support migration but we still use Spice:
     vncserver_listen        => '0.0.0.0',
     migration_support       => true,
-    libvirt_disk_cachemodes => $libvirt_disk_cachemodes_real
+    libvirt_disk_cachemodes => $libvirt_disk_cachemodes_real,
+    libvirt_service_name    => $::cloud::params::libvirt_service_name,
   }
 
   # Extra config for nova-compute

manifests/params.pp

@@ -42,12 +42,21 @@ class cloud::params {
       $start_haproxy_service = '"/usr/bin/systemctl start haproxy"'
       $stop_haproxy_service  = '"/usr/bin/systemctl stop haproxy"'
       $horizon_auth_url      = 'dashboard'
+      $libvirt_service_name  = 'libvirtd'
     } # RedHat
     'Debian': {
       # Specific to Debian / Ubuntu
       $start_haproxy_service = '"/etc/init.d/haproxy start"'
       $stop_haproxy_service  = '"/etc/init.d/haproxy stop"'
       $horizon_auth_url      = 'horizon'
+      case $::operatingsystem {
+        'Ubuntu': {
+          $libvirt_service_name = 'libvirt-bin'
+        }
+        default: {
+          $libvirt_service_name = 'libvirtd'
+        }
+      }
     } # Debian
     default: {
       fail("Unsupported osfamily (${::osfamily})")

metadata.json

@@ -14,7 +14,7 @@
     {"operatingsystem": "RedHat"}
   ],
   "requirements": [
-    {"name": "pe","version_requirement": "3.2.x"},
+    {"name": "pe","version_requirement": "3.6.x"},
     {"name": "puppet","version_requirement": "3.x"}
   ],
   "description": "Puppet module that pulls together all the individual components of Openstack, resulting is a complete and functional stack",

spec/classes/cloud_compute_hypervisor_spec.rb

@@ -540,6 +540,7 @@ describe 'cloud::compute::hypervisor' do
     end
 
     it_configures 'openstack compute hypervisor'
+    it { should contain_file_line('/etc/default/libvirtd libvirtd opts').with(:line => 'libvirtd_opts="-d -l"') }
   end
 
   context 'on RedHat platforms' do
@@ -553,6 +554,7 @@ describe 'cloud::compute::hypervisor' do
     end
 
     it_configures 'openstack compute hypervisor'
+    it { should contain_file_line('/etc/sysconfig/libvirtd libvirtd args').with(:line => 'LIBVIRTD_ARGS="--listen"') }
   end
 
 end