diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 22:39:45 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-04 16:10:07 +0000 |
| commit | 22ecca10820dc2cd0de04a6c1a18fb71d1274321 (patch) | |
| tree | 42ed20aafc1e2013df3791bc397b64fff883d66e | |
| parent | 9238abc2972b796eacc84e2767d4548664495d97 (diff) | |
Rebase: p/f-l: Update VGA defaults patch context.
Minor change upstream requires us to rebase this patch.
| -rw-r--r-- | patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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": |