summaryrefslogtreecommitdiffstats
path: root/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-26 15:02:17 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-26 15:02:18 +0000
commitdb85b247c8d7098bdaf48f5d6cc1dee3c85f34f6 (patch)
treebf95db630ca9785c20ca43a1696c8d99c1910a02 /patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
parentf99f04973d6fb9bfd1f0fef411c8d7cfa5a4469f (diff)
parentd6f0b449f673cd5a5514fa9b250bce6e691f67de (diff)
Merge "bootstrap: Add lshw package (also in fuel-mirror)."
Diffstat (limited to 'patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch')
-rw-r--r--patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch23
1 files changed, 18 insertions, 5 deletions
diff --git a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
index 441e990c..5df52fa1 100644
--- a/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
+++ b/patches/fuel-mirror/0002-Add-fuel-agent-dependencies-to-Ubuntu-mirror.patch
@@ -13,12 +13,17 @@ missing deps from local mirror too?
FIXME: Remove udev package from this patch when Ubuntu Trusty on arm64
fixes persistent device names in the udev it ships out of the box.
+
+FIXME: Remove lshw package from this patch when Ubuntu Trusty on arm64
+fixes bug [1]: "AArch64: slow cpuinfo due to redundant loop".
+
+[1] https://bugs.launchpad.net/ubuntu/+source/lshw/+bug/1582181
---
- contrib/fuel_mirror/data/ubuntu.yaml | 3 +++
- 1 file changed, 3 insertions(+)
+ contrib/fuel_mirror/data/ubuntu.yaml | 4 ++++
+ 1 file changed, 4 insertions(+)
diff --git a/contrib/fuel_mirror/data/ubuntu.yaml b/contrib/fuel_mirror/data/ubuntu.yaml
-index 7bc0c4b..4509a9a 100644
+index cd86ec9..2ec4f1d 100644
--- a/contrib/fuel_mirror/data/ubuntu.yaml
+++ b/contrib/fuel_mirror/data/ubuntu.yaml
@@ -77,6 +77,7 @@ packages: &packages
@@ -29,7 +34,15 @@ index 7bc0c4b..4509a9a 100644
- "build-essential"
- "cloud-init"
- "conntrackd"
-@@ -113,6 +114,7 @@ packages: &packages
+@@ -101,6 +102,7 @@ packages: &packages
+ - "linux-image-generic-lts-trusty"
+ - "live-boot"
+ - "livecd-rootfs"
++ - "lshw"
+ - "mc"
+ - "memcached"
+ - "monit"
+@@ -116,6 +118,7 @@ packages: &packages
- "puppet"
- "python-lesscpy"
- "python-pip"
@@ -37,7 +50,7 @@ index 7bc0c4b..4509a9a 100644
- "rsyslog-gnutls"
- "rsyslog-relp"
- "screen"
-@@ -124,6 +126,7 @@ packages: &packages
+@@ -127,6 +130,7 @@ packages: &packages
- "tmux"
- "traceroute"
- "ubuntu-standard"