summaryrefslogtreecommitdiffstats
path: root/patches/fuel-agent
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-13 18:00:15 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-13 18:22:00 +0200
commitfd5d134116903def30c1c9bfda69edd4580a9643 (patch)
treee58573f5259a460145786b7095f010a4efed8763 /patches/fuel-agent
parent2131e2aa5fedf4ebeecf1e719054061e950b4e92 (diff)
Rebase: p/fuel-agent: Patch context refresh.
Diffstat (limited to 'patches/fuel-agent')
-rw-r--r--patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch7
-rw-r--r--patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch3
2 files changed, 3 insertions, 7 deletions
diff --git a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
index 96b0e630..6f28d8a3 100644
--- a/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
+++ b/patches/fuel-agent/0001-Use-qemu-debootstrap-for-image-creation.patch
@@ -20,9 +20,7 @@ diff --git a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/b
index ca2d3e1..b0d410d 100644
--- a/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/build.py
+++ b/contrib/fuel_bootstrap/fuel_bootstrap_cli/fuel_bootstrap/commands/build.py
-@@ -166,6 +166,14 @@ class BuildCommand(command.Command):
- " files",
- action='append'
+@@ -166,4 +166,12 @@ class BuildCommand(command.Command):
)
+ parser.add_argument(
+ '--target_arch',
@@ -66,8 +64,7 @@ diff --git a/fuel_agent/manager.py b/fuel_agent/manager.py
index 15cc5d8..f613aef 100644
--- a/fuel_agent/manager.py
+++ b/fuel_agent/manager.py
-@@ -18,6 +18,7 @@ import shutil
- import signal
+@@ -18,5 +18,6 @@ import shutil
from oslo_config import cfg
+from oslo_config import types
diff --git a/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch b/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
index 7f6d2c3d..37017e1a 100644
--- a/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
+++ b/patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch
@@ -35,8 +35,7 @@ index 6322a10..843c40b 100644
if hasattr(bs_scheme, 'certs') and bs_scheme.certs:
bu.copy_update_certs(bs_scheme.certs, chroot)
bu.run_apt_get(chroot, packages=packages,
-@@ -873,6 +878,7 @@ class Manager(object):
- force_ipv4_file=CONF.force_ipv4_file)
+@@ -873,5 +878,6 @@ class Manager(object):
# restore disabled hosts/resolv files
bu.restore_resolv_conf(chroot)
+ bu.restore_newaliases(chroot)