diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-21 18:34:06 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-01-21 18:34:06 +0000 |
commit | 4c74ad945b5b20be3014178070b495f10c16a74e (patch) | |
tree | f76b2e9892bd056b3da3a03a0ad27c5f8d2bb9ab /patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch | |
parent | 2662d9c5800b67d9375c22ccac439e3aeea3b4e5 (diff) | |
parent | e42a9b3011f96ad26f4a19db77ac44cad31a4290 (diff) |
Merge "Uplift Armband to Fuel Newton"
Diffstat (limited to 'patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch')
-rw-r--r-- | patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch b/patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch index 9e9c3d53..be481a78 100644 --- a/patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch +++ b/patches/fuel-library/arm64-bug-fixes/0003-nova-Update-vga-console-defaults-for-armv7-aarch64.patch @@ -75,18 +75,17 @@ index b18fa7b..2f0f2a8 100644 case $::osfamily { 'RedHat': { # From legacy libvirt.pp -@@ -290,6 +296,7 @@ class openstack_tasks::roles::compute { +@@ -290,5 +296,6 @@ class openstack_tasks::roles::compute { } $notify_on_state_change = 'vm_and_task_state' + $nova_path = '/usr/lib/python2.7/dist-packages/nova' class { '::nova': - rpc_backend => $rpc_backend_real, -@@ -311,6 +318,18 @@ class openstack_tasks::roles::compute { - memcached_servers => $memcached_addresses, - cinder_catalog_info => pick($nova_hash_real['cinder_catalog_info'], 'volumev2:cinderv2:internalURL'), - rabbit_heartbeat_timeout_threshold => $::os_service_default, +@@ -311,5 +318,17 @@ class openstack_tasks::roles::compute { + rabbit_heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, + rabbit_heartbeat_rate => $rabbit_heartbeat_rate, + os_region_name => $region_name, + } -> + # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver + file { "${nova_path}/libvirt-vga-console.patch": @@ -101,4 +100,3 @@ index b18fa7b..2f0f2a8 100644 + require => [Package['patch']], } - class { '::nova::availability_zone': |