patches, docs: Remove MySQL WSREP SST provider

[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 33d31ff..199ef12 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
@@ -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
 
@@ -17,7 +17,7 @@ new file mode 100644
 index 0000000..c5f8e5a
 --- /dev/null
 +++ b/deployment/puppet/openstack/files/nova-libvirt-vga-console.patch
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,40 @@
 +From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
 +Date: Tue, 22 Mar 2016 12:05:09 +0100
 +Subject: [PATCH] Update vga, console defaults for armv7 and aarch64
@@ -47,45 +47,41 @@ index 0000000..c5f8e5a
 +             if virt_type == "qemu":
 +                 guest.os_cmdline += " no_timer_check"
 +         if instance.ramdisk_id:
-+@@ -3972,7 +3972,8 @@ class LibvirtDriver(driver.ComputeDriver):
++@@ -3972,7 +3972,9 @@ class LibvirtDriver(driver.ComputeDriver):
 +             video.type = 'xen'
 +         elif CONF.libvirt.virt_type == 'parallels':
 +             video.type = 'vga'
-+-        elif guestarch in (arch.PPC, arch.PPC64):
-++        elif guestarch in (arch.ARMV7, arch.AARCH64, arch.PPC, arch.PPC64):
++-        elif guestarch in (arch.PPC, arch.PPC64, arch.PPC64LE):
+++        elif guestarch in (arch.ARMV7, arch.AARCH64,
+++                           arch.PPC, arch.PPC64, arch.PPC64LE):
 ++            # NOTE(armband): Added ARM v7/v8, same as on PPC.
 +             # 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 (
+     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":
@@ -100,4 +96,3 @@ index c0349dc..46b1801 100644
 +    require => [Package['patch']],
    }
  
-   if str2bool($::is_virtual) {