diff options
| author |   Florin Dumitrascu <florin.dumitrascu@enea.com> | 2016-03-08 14:17:01 +0100 |
|---|---|---|
| committer | Florin Dumitrascu <florin.dumitrascu@enea.com> | 2016-03-22 19:03:21 +0100 |
| commit | 80ba8c45cda5308010ded08b3d070343a92d58b5 (patch) | |
| tree | faa6ffd8020d73cee7a1cc966dee5ab1af557163 /patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch | |
| parent | 7bfc08a72654b440b52c609ca67199f13df2f668 (diff) | |
Add fixes and improvements for arm64 deployment
[ Florin Dumitrascu <florin.dumitrascu@enea.com> ]
* arm64 support for OpenDaylight Fuel Plugin
[ Stanislaw Kardach <kda@semihalf.com> ]
* Limit ESP to first drive
* Remove default+timeout+tr from cobbler profile
* Fix puppet syntax errors
* Disable usb tablet on aarch64
* Support direct kernel boot for CirrOS TestVM on aarch64
* Remove git version signature not to confuse patches-export
* Fix VGA support for CirrOS TestVM
* Makefile: Add clean-{docker,build}.
[ Alexandru Avadanii <Alexandru.Avadanii@enea.com> ]
* Performance: Use gzip instead of xz compression.
* Switch mirror proto from https to http.
* Update TODO with remaining tasks.
* Disable amd64 Liberty fixture (no multi-arch support yet).
* m1.micro: Increase RAM size to 128MB for aarch64 images.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
Signed-off-by: Stanislaw Kardach <kda@semihalf.com>
Diffstat (limited to 'patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch')
| -rw-r--r-- | patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch | 33 |
1 files changed, 21 insertions, 12 deletions
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 0ea66f66..b9a8ed10 100644 --- 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 - |