diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-13 19:37:20 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 12:01:02 +0000 |
| commit | 2741c6e75c660727177b9d32d5cf29c60b40eb25 (patch) | |
| tree | aa0c68d520701d58380fd6fa7989576ba0406200 /patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch | |
| parent | 85c96cb879081b3b13a6d53c50866637d09f9f42 (diff) | |
Rebase: p/fuel-library: Update after 96da5b4a.
Refresh patches after:
"Move openstack specific tasks to their own folder structure"
NOTE: The qemu-kvm change patch
(0003-Make-qemu-kvm-architecture-aware.patch) only affects
RedHat systems, so it is optional, at least for the current stage.
[1] https://github.com/openstack/fuel-library/commit/
96da5b4a1eb82a76fb416d93f5249dc32e2499f2
Change-Id: Ibd1fd3f7e45d7947c90336bbe7e2ace101b5802b
Diffstat (limited to 'patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch')
| -rw-r--r-- | patches/fuel-library/0009-Update-vga-console-defaults-for-armv7-and-aarch64.patch | 32 |
1 files changed, 13 insertions, 19 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 33d31ff4..a1325172 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 @@ -8,7 +8,7 @@ use PL011 serial driver for guests, adding console=ttyAMA0 is also a nice UX addition. --- .../openstack/files/nova-libvirt-vga-console.patch | 39 ++++++++++++++++++++++ - deployment/puppet/openstack/manifests/compute.pp | 19 +++++++++++ + deployment/puppet/openstack_tasks/manifests/roles/compute.pp | 19 +++++++++++ 2 files changed, 58 insertions(+) create mode 100644 deployment/puppet/openstack/files/nova-libvirt-vga-console.patch @@ -57,35 +57,30 @@ index 0000000..c5f8e5a + # NOTE(ldbragst): PowerKVM doesn't support 'cirrus' be default + # so use 'vga' instead when running on Power hardware. + video.type = 'vga' -diff --git a/deployment/puppet/openstack/manifests/compute.pp b/deployment/puppet/openstack/manifests/compute.pp +diff --git a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp index c0349dc..46b1801 100644 ---- a/deployment/puppet/openstack/manifests/compute.pp -+++ b/deployment/puppet/openstack/manifests/compute.pp -@@ -157,6 +157,12 @@ class openstack::compute ( - } - } - +--- a/deployment/puppet/openstack_tasks/manifests/roles/compute.pp ++++ b/deployment/puppet/openstack_tasks/manifests/roles/compute.pp +@@ -157,4 +157,10 @@ class openstack::compute ( + + include ::nova::params ++ + if ! defined(Package['patch']) { + package { 'patch': + ensure => 'present', + } + } -+ - $glance_connection = $glance_api_servers case $::osfamily { -@@ -250,6 +256,7 @@ class openstack::compute ( +@@ -250,3 +256,4 @@ class openstack::compute ( - $memcached_addresses = suffix($cache_server_ip, inline_template(":<%= @cache_server_port %>")) $notify_on_state_change = 'vm_and_task_state' + $nova_path = '/usr/lib/python2.7/dist-packages/nova' - class { 'nova': - install_utilities => false, -@@ -273,6 +280,18 @@ class openstack::compute ( - service_down_time => $nova_service_down_time, - notify_on_state_change => $notify_on_state_change, - memcached_servers => $memcached_addresses, +@@ -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'), + } -> + # FIXME(armband): Workaround for missing arm defaults in nova libvirt driver + file { "${nova_path}/libvirt-vga-console.patch": @@ -100,4 +95,3 @@ index c0349dc..46b1801 100644 + require => [Package['patch']], } - if str2bool($::is_virtual) { |