summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules4
-rw-r--r--Makefile4
-rw-r--r--TODO.md3
-rw-r--r--patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch65
-rw-r--r--patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch43
m---------upstream/fuel-nailgun-agent0
6 files changed, 115 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index d5ab1033..4f159866 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,7 @@
path = upstream/fuel-plugin-opendaylight
url = https://github.com/openstack/fuel-plugin-opendaylight.git
branch = brahmaputra-release
+[submodule "fuel-nailgun-agent"]
+ path = upstream/fuel-nailgun-agent
+ url = https://github.com/openstack/fuel-nailgun-agent
+ branch = stable/8.0
diff --git a/Makefile b/Makefile
index 9490f5a9..e58fe0d7 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ build:
FUELLIB_REPO=${root}/upstream/fuel-library \
NAILGUN_REPO=${root}/upstream/fuel-web \
FUEL_AGENT_REPO=${root}/upstream/fuel-agent \
+ FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \
FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
QEMU_REPO=${root}/upstream/fuel-plugin-qemu \
OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \
@@ -66,6 +67,7 @@ build:
FUELLIB_COMMIT=HEAD \
NAILGUN_COMMIT=HEAD \
FUEL_AGENT_COMMIT=HEAD \
+ FUEL_NAILGUN_AGENT_COMMIT=HEAD \
FUEL_MIRROR_COMMIT=HEAD \
QEMU_BRANCH=HEAD \
OVSNFV_DPDK_BRANCH=armband-workbench \
@@ -73,7 +75,7 @@ build:
PRODUCT_VERSION=8.0 \
PRODUCT_NAME=mos \
CENTOS_MAJOR=7 \
- MIRROR_FUEL=http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/os/x86_64/ \
+ EXTRA_RPM_REPOS="armband,http://linux.enea.com/mos-repos/centos/mos8.0-centos7-fuel/armband/x86_64,10" \
MIRROR_UBUNTU_URL=http://archive.ubuntu.com/ubuntu/ \
LATEST_MIRROR_ID_URL=http://linux.enea.com/ \
JAVA8_URL=https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_arm64.deb \
diff --git a/TODO.md b/TODO.md
index 6c4b8a2b..cce67cad 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,7 +7,6 @@ Nice to have, should be fixed before rel
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
@@ -16,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-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
new file mode 100644
index 00000000..866e402f
--- /dev/null
+++ b/patches/fuel-nailgun-agent/0001-ohai-Support-reading-L1-info-from-ethtool.patch
@@ -0,0 +1,65 @@
+From: Enea Armband Devops Team <armband@enea.com>
+Date: Sat, 2 Apr 2016 22:57:59 +0200
+Subject: [PATCH] ohai: Support reading L1 info from ethtool.
+
+Traditional methods of reading the ethernet card speed rely on the
+drivers populating the advertised and/or supported link speed lists.
+
+This is not true for all drivers, especially for some Fibers
+that only report the speed via ethtool when the link is up.
+
+This patch adds support for reading L1 info from ohai, which
+supports parsing ethtool speed starting with version amos2 [1].
+
+[1] https://linux.enea.com/mos-repos/ubuntu/8.0/pool/main/o/
+ ohai/ohai_6.14.0-2~u14.04+mos1+mos8.0+amos2_all.deb
+---
+ ...ohai-Support-reading-L1-info-from-ethtool.patch | 34 ++++++++++++++++++++++
+ debian/patches/series | 1 +
+ 2 files changed, 35 insertions(+)
+ create mode 100644 debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
+ create mode 100644 debian/patches/series
+
+diff --git a/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch b/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
+new file mode 100644
+index 0000000..aa50ea4
+--- /dev/null
++++ b/debian/patches/0001-ohai-Support-reading-L1-info-from-ethtool.patch
+@@ -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.
++
++Upstream ohai [1] introduces support for reading layer one information
++from ethtool. Allow nailgun-agent to use that info if present.
++
++[1] https://github.com/chef/ohai/commit/
++ afd42e9122f057ab00dd24357c28dc2ad6806434
++---
++ agent | 6 +++++-
++ 1 file changed, 5 insertions(+), 1 deletion(-)
++
++diff --git a/agent b/agent
++index c764a68..978131f 100755
++--- a/agent
+++++ b/agent
++@@ -316,7 +316,11 @@ class NodeAgent
++ int_meta[:current_speed] = int_info.current_mode.speed
++ end
++ rescue
++- int_meta[:current_speed] = nil
+++ if intinfo.has_key?(:link_speed) && 0 < intinfo[:link_speed]
+++ int_meta[:current_speed] = intinfo[:link_speed]
+++ else
+++ int_meta[:current_speed] = nil
+++ end
++ end
++ elsif (addrinfo[:family] rescue nil) =~ /^inet$/
++ int_meta[:ip] = addr
+diff --git a/debian/patches/series b/debian/patches/series
+new file mode 100644
+index 0000000..b221a98
+--- /dev/null
++++ b/debian/patches/series
+@@ -0,0 +1 @@
++0001-ohai-Support-reading-L1-info-from-ethtool.patch
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
diff --git a/upstream/fuel-nailgun-agent b/upstream/fuel-nailgun-agent
new file mode 160000
+Subproject b2bb466fd5bd92da614cdbd819d6999c510ebfb