diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-16 11:50:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-16 11:50:09 +0000 |
| commit | a4ada554960efa8eeb551bbc14aabd275aa51981 (patch) | |
| tree | da6952c0a08e223da6fb7e75f91d8483abe39fbd /patches/fuel-agent | |
| parent | 9fcc28e0eebfa15b07b03630cffdca565f2565f6 (diff) | |
| parent | fd5d134116903def30c1c9bfda69edd4580a9643 (diff) | |
Merge "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.patch | 7 | ||||
| -rw-r--r-- | patches/fuel-agent/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch | 3 |
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) |