From 22ecca10820dc2cd0de04a6c1a18fb71d1274321 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 31 May 2016 22:39:45 +0200 Subject: Rebase: p/f-l: Update VGA defaults patch context. Minor change upstream requires us to rebase this patch. --- .../0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'patches/fuel-library') 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 a1325172..0b0614e4 100644 --- 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": -- cgit 1.2.3-korg