Rebase for "Improve reliability of upload_cirros"

[armband.git] / patches / fuel-library / 0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch

diff --git a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch b/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch
index a132517..0b0614e 100644 (file)
--- a/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch
+++ b/patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch
@@ -78,9 +78,9 @@ index c0349dc..46b1801 100644
 +  $nova_path = '/usr/lib/python2.7/dist-packages/nova'
  
 @@ -273,5 +280,17 @@ class openstack::compute (
-     notification_driver    => $ceilometer_hash['notification_driver'],
-     memcached_servers      => $memcached_addresses,
-     cinder_catalog_info    => pick($nova_hash_real['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'),
+     memcached_servers                  => $memcached_addresses,
+     cinder_catalog_info                => pick($nova_hash_real['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'),
+     rabbit_heartbeat_timeout_threshold => $::os_service_default,
 +  } ->
 +  # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver
 +  file { "${nova_path}/libvirt-vga-console.patch":