summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
diff options
context:
space:
mode:
authorFlorin Dumitrascu <florin.dumitrascu@enea.com>2016-03-08 14:17:01 +0100
committerFlorin Dumitrascu <florin.dumitrascu@enea.com>2016-03-22 19:03:21 +0100
commit80ba8c45cda5308010ded08b3d070343a92d58b5 (patch)
treefaa6ffd8020d73cee7a1cc966dee5ab1af557163 /patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
parent7bfc08a72654b440b52c609ca67199f13df2f668 (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/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch')
-rw-r--r--patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch15
1 files changed, 4 insertions, 11 deletions
diff --git a/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch b/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
index 56796d48..d8a6a03d 100644
--- a/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
+++ b/patches/fuel-library/0001-Add-arm64-templates-to-cobbler-and-nailgun.patch
@@ -9,13 +9,13 @@ Add arm64 templates to cobbler and nailgun
deployment/puppet/cobbler/manifests/server.pp | 27 +++++++++++++++
.../puppet/cobbler/templates/dnsmasq.template.erb | 2 ++
.../cobbler/templates/efidefault.template.erb | 5 +++
- .../cobbler/templates/grubprofile.template.erb | 16 +++++++++
+ .../cobbler/templates/grubprofile.template.erb | 12 +++++++
.../cobbler/templates/grubsystem.template.erb | 16 +++++++++
.../templates/preseed/ubuntu-1404.preseed.erb | 2 ++
.../puppet/nailgun/manifests/auxiliaryrepos.pp | 12 ++++---
deployment/puppet/nailgun/manifests/cobbler.pp | 38 +++++++++++++++++-----
.../puppet/nailgun/manifests/cobbler/preseed.pp | 13 ++++++++
- 9 files changed, 119 insertions(+), 12 deletions(-)
+ 9 files changed, 115 insertions(+), 12 deletions(-)
create mode 100644 deployment/puppet/cobbler/templates/efidefault.template.erb
create mode 100644 deployment/puppet/cobbler/templates/grubprofile.template.erb
create mode 100644 deployment/puppet/cobbler/templates/grubsystem.template.erb
@@ -84,14 +84,10 @@ index 0000000..af09eb8
+$grub_menu_items
diff --git a/deployment/puppet/cobbler/templates/grubprofile.template.erb b/deployment/puppet/cobbler/templates/grubprofile.template.erb
new file mode 100644
-index 0000000..9a191bc
+index 0000000..eb7557c
--- /dev/null
+++ b/deployment/puppet/cobbler/templates/grubprofile.template.erb
-@@ -0,0 +1,16 @@
-+set default=1
-+set timeout=5
-+tr -s ipxe_mac ':' '-' $net_default_mac
-+
+@@ -0,0 +1,12 @@
+menuentry '$profile_name' {
+ echo 'Network status:'
+ net_ls_cards
@@ -268,6 +264,3 @@ index 0000000..93c71ba
+ require => Class['::cobbler::server'],
+ }
+}
---
-1.9.1
-