summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO.md4
-rw-r--r--patches/fuel-agent/0005-Add-esp-partition-flag.patch (renamed from patches/fuel-agent/0006-Add-esp-partition-flag.patch)0
-rw-r--r--patches/fuel-library/0012-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch51
-rw-r--r--patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch6
-rw-r--r--patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch43
5 files changed, 95 insertions, 9 deletions
diff --git a/TODO.md b/TODO.md
index d5dcac5c..cce67cad 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,11 +4,9 @@ List of missing features and things to do
Nice to have, should be fixed before rel
=========================================
* [fuel?] Disabling rx-vlan-filter from Fuel WebUI is not applied during netcheck
-* [thunderx] rtc-efi disable (bootstrap handled, target image remaining)
Cleanup tasks
=========================================
-* [armband-rpm-repo] Armband CentOS repository as additional repo (x86_64)
* [arm64-master] Find `puppetlabs-products` repo for arm64.
* [arm64-master] Fix license in ubuntu_1404_arm64.pp
* [arm64-master] Look into default ubuntu_debootstrap change in cobbler.pp
@@ -17,8 +15,6 @@ Cleanup tasks
* [ohai] ThunderX network card speed reported as N/A
* [arm64-master] change docker repo in `upstream/fuel/build/config.mk`,
perhaps by figuring out current architecture with `uname -m`
-* [arm64-master] Fuel Master YUM repos still point to mirror.fuel-infra.org,
- due to bootstrap_admin_node.sh hardcodes from OPNFV
Needed for all arch support (todo, later)
=========================================
diff --git a/patches/fuel-agent/0006-Add-esp-partition-flag.patch b/patches/fuel-agent/0005-Add-esp-partition-flag.patch
index a1990565..a1990565 100644
--- a/patches/fuel-agent/0006-Add-esp-partition-flag.patch
+++ b/patches/fuel-agent/0005-Add-esp-partition-flag.patch
diff --git a/patches/fuel-library/0012-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch b/patches/fuel-library/0012-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch
new file mode 100644
index 00000000..cfc1f6cb
--- /dev/null
+++ b/patches/fuel-library/0012-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch
@@ -0,0 +1,51 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sun, 17 Apr 2016 17:53:46 +0200
+Subject: [PATCH] target Ubuntu: Blacklist rtc-efi if not supported.
+
+Older ThunderX and possibly other UEFI-enabled targets do not support
+rtc-efi properly, so they end up filling dmesg with useless
+complaints about not being able to read system time.
+
+Target OS (Ubuntu) deployment already has a snippet that blacklists
+i2c_piix4 in certain scenarios, so provide a similar test for rtc_efi.
+
+update-initramfs is already invoked from i2c_piix4 snippet, so ommit
+explicitly calling it in rtc_efi fragment.
+---
+ deployment/puppet/cobbler/manifests/snippets.pp | 1 +
+ deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb | 1 +
+ .../puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 deployment/puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb
+
+diff --git a/deployment/puppet/cobbler/manifests/snippets.pp b/deployment/puppet/cobbler/manifests/snippets.pp
+index 46c76d0..5ab9a17 100644
+--- a/deployment/puppet/cobbler/manifests/snippets.pp
++++ b/deployment/puppet/cobbler/manifests/snippets.pp
+@@ -58,6 +58,7 @@ class cobbler::snippets {
+ cobbler_snippet {"centos_static_net":}
+ cobbler_snippet {"ofed_install_with_sriov":}
+ cobbler_snippet {"ubuntu_authorized_keys":}
++ cobbler_snippet {"ubuntu_blacklist_rtc_efi":}
+ cobbler_snippet {"ubuntu_blacklist_i2c_piix4":}
+ cobbler_snippet {"ubuntu_disable_pxe":}
+ cobbler_snippet {"ubuntu_puppet_config":}
+diff --git a/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb b/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb
+index 65c6c69..8e17a0e 100644
+--- a/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb
++++ b/deployment/puppet/cobbler/templates/preseed/ubuntu-1404.preseed.erb
+@@ -177,6 +177,7 @@ echo target > /target/etc/nailgun_systemtype && \
+ $SNIPPET('ubuntu_authorized_keys')
+ sed -i -e "/^\s*GSSAPICleanupCredentials yes/d" -e "/^\s*GSSAPIAuthentication yes/d" -e "s/.*PasswordAuthentication\ .*/PasswordAuthentication\ no/g" -e "/UseDNS/d" /target/etc/ssh/sshd_config && \
+ echo "UseDNS no" >> /target/etc/ssh/sshd_config && \
++$SNIPPET('ubuntu_blacklist_rtc_efi')
+ $SNIPPET('ubuntu_blacklist_i2c_piix4')
+ $SNIPPET('ubuntu_static_net')
+ $SNIPPET('ofed_install_with_sriov')
+diff --git a/deployment/puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb b/deployment/puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb
+new file mode 100644
+index 0000000..902f142
+--- /dev/null
++++ b/deployment/puppet/cobbler/templates/snippets/ubuntu_blacklist_rtc_efi.erb
+@@ -0,0 +1 @@
++( /bin/cat /sys/class/rtc/rtc0/time > /dev/null 2>&1 || echo "blacklist rtc_efi" >> /target/etc/modprobe.d/blacklist-rtc_efi.conf ) && \
diff --git a/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch b/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
index 911001f4..866e402f 100644
--- a/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
+++ b/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
@@ -25,8 +25,7 @@ new file mode 100644
index 0000000..aa50ea4
--- /dev/null
+++ b/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
-@@ -0,0 +1,34 @@
-+From 942c67f74c00b1097d1ad27ece79fe91b475190c Mon Sep 17 00:00:00 2001
+@@ -0,0 +1,30 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Sat, 2 Apr 2016 22:54:27 +0200
+Subject: [PATCH] ohai: Support reading L1 info from ethtool.
@@ -57,9 +56,6 @@ index 0000000..aa50ea4
+ end
+ elsif (addrinfo[:family] rescue nil) =~ /^inet$/
+ int_meta[:ip] = addr
-+--
-+1.9.1
-+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b221a98
diff --git a/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch b/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
new file mode 100644
index 00000000..670e8728
--- /dev/null
+++ b/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
@@ -0,0 +1,43 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Mon, 18 Apr 2016 17:24:25 +0200
+Subject: [PATCH] Separate armband repo-comp from upstream RPM repos.
+
+Instead of using linux.enea.com for ALL RPM packages for CentOS7,
+by overriding FUEL_MIRROR in the Makefile, we switched to using
+EXTRA_RPM_REPOS variable to point to armband RPM repo-component.
+
+This way, the bulk of RPM packages will be fetched from upstream,
+instead of our mirror.
+
+This requires updating ks.cfg{,.orig} with the new armband repo.
+---
+ build/f_isoroot/f_kscfg/ks.cfg | 2 +-
+ build/f_isoroot/f_kscfg/ks.cfg.orig | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg
+index 30bad1d..b58f98b 100644
+--- a/build/f_isoroot/f_kscfg/ks.cfg
++++ b/build/f_isoroot/f_kscfg/ks.cfg
+@@ -14,7 +14,7 @@ unsupported_hardware
+ # SKIP CONFIGURING X
+ skipx
+ repo --name="mos-centos" --baseurl=file:///run/install/repo/mos-centos/ --cost=100
+-
++repo --name="armband" --baseurl=file:///run/install/repo/extra-repos/armband --cost=10
+ # NEVER ever place zerombr here, it breaks automated installation
+ %include /tmp/bootloader.ks
+ %include /tmp/partition.ks
+diff --git a/build/f_isoroot/f_kscfg/ks.cfg.orig b/build/f_isoroot/f_kscfg/ks.cfg.orig
+index f8a43da..5f541a4 100755
+--- a/build/f_isoroot/f_kscfg/ks.cfg.orig
++++ b/build/f_isoroot/f_kscfg/ks.cfg.orig
+@@ -14,7 +14,7 @@ unsupported_hardware
+ # SKIP CONFIGURING X
+ skipx
+ repo --name="mos-centos" --baseurl=file:///run/install/repo/mos-centos/ --cost=100
+-
++repo --name="armband" --baseurl=file:///run/install/repo/extra-repos/armband --cost=10
+ # NEVER ever place zerombr here, it breaks automated installation
+ %include /tmp/bootloader.ks
+ %include /tmp/partition.ks