Rebase after "Bugfix Broadcast Group".

[armband.git] / patches / fuel-library / 0004-Make-TestVM-creation-architecture-aware.patch

diff --git a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
index 0ea66f6..b9a8ed1 100644 (file)
--- a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
+++ b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch
@@ -7,12 +7,12 @@ images.
 ---
  deployment/puppet/openstack/manifests/img/cirros.pp           |  8 ++++++--
  .../puppet/osnailyfacter/modular/generate_vms/generate_vms.pp | 11 +++++++++++
- deployment/puppet/osnailyfacter/templates/vm_libvirt.erb      |  5 ++++-
+ deployment/puppet/osnailyfacter/templates/vm_libvirt.erb      |  9 ++++++++-
  files/fuel-migrate/fuel-migrate                               |  5 ++++-
- 4 files changed, 25 insertions(+), 4 deletions(-)
+ 4 files changed, 29 insertions(+), 4 deletions(-)
 
 diff --git a/deployment/puppet/openstack/manifests/img/cirros.pp b/deployment/puppet/openstack/manifests/img/cirros.pp
-index 84e202e..57ae256 100644
+index 84e202e..cff06e0 100644
 --- a/deployment/puppet/openstack/manifests/img/cirros.pp
 +++ b/deployment/puppet/openstack/manifests/img/cirros.pp
 @@ -9,6 +9,10 @@ class openstack::img::cirros (
@@ -20,8 +20,8 @@ index 84e202e..57ae256 100644
    $os_name = 'cirros',
  ) {
 +  $arch = $::architecture ? {
-+      'arm64', 'aarch64' => 'aarch64',
-+      default => 'x86_64',
++      /(arm64|aarch64)/ => 'aarch64',
++      default           => 'x86_64',
 +  }
  
    package { 'cirros-testvm':
@@ -66,7 +66,7 @@ index 6d5426a..da5954e 100644
      owner   => 'root',
      group   => 'root',
 diff --git a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
-index ae2ba5b..decf3ab 100644
+index ae2ba5b..2d030d9 100644
 --- a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
 +++ b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb
 @@ -3,7 +3,7 @@
@@ -82,12 +82,24 @@ index ae2ba5b..decf3ab 100644
      <acpi/>
      <apic/>
      <pae/>
-+  <% if $machine_arch == 'arm64' { %>
-+    <gic version='3' />
-+  <% } %>
++  <% if $machine_arch == 'aarch64' %>
++    <gic version='host' />
++  <% end %>
    </features>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
+@@ -57,7 +60,11 @@
+     <input type='keyboard' bus='ps2'/>
+     <graphics type='vnc' port='-1' autoport='yes'/>
+     <video>
++<% if $machine_arch == 'aarch64' %>
++      <model type='vga' vram='9216' heads='1'/>
++<% else %>
+       <model type='cirrus' vram='9216' heads='1'/>
++<% end %>
+     </video>
+     <memballoon model='virtio'>
+     </memballoon>
 diff --git a/files/fuel-migrate/fuel-migrate b/files/fuel-migrate/fuel-migrate
 index fad9436..667d4a7 100755
 --- a/files/fuel-migrate/fuel-migrate
@@ -117,6 +129,3 @@ index fad9436..667d4a7 100755
    </features>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
--- 
-1.9.1
-