diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-21 18:34:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-21 18:34:06 +0000 |
| commit | 4c74ad945b5b20be3014178070b495f10c16a74e (patch) | |
| tree | f76b2e9892bd056b3da3a03a0ad27c5f8d2bb9ab /patches/fuel-agent/cross-bootstrap | |
| parent | 2662d9c5800b67d9375c22ccac439e3aeea3b4e5 (diff) | |
| parent | e42a9b3011f96ad26f4a19db77ac44cad31a4290 (diff) | |
Merge "Uplift Armband to Fuel Newton"
Diffstat (limited to 'patches/fuel-agent/cross-bootstrap')
2 files changed, 3 insertions, 5 deletions
diff --git a/patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch b/patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch index 54e8027e..b68ca4e4 100644 --- a/patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch +++ b/patches/fuel-agent/cross-bootstrap/0001-Use-qemu-debootstrap-for-image-creation.patch @@ -70,12 +70,11 @@ index df54f65..ba1ab78 100644 import tempfile from oslo_config import cfg + from oslo_log import log as logging +from oslo_config import types import six import yaml - -@@ -34,6 +35,8 @@ from fuel_agent.utils import md as mu - from fuel_agent.utils import partition as pu +@@ -34,5 +35,7 @@ from fuel_agent.utils import md as mu from fuel_agent.utils import utils +ArchType = types.String(choices=['amd64', 'arm64']) diff --git a/patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch b/patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch index 75602951..8a0cbcf3 100644 --- a/patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch +++ b/patches/fuel-agent/cross-bootstrap/0004-Prevent-common-cross-debootstrap-newaliases-issue.patch @@ -35,8 +35,7 @@ index 637c99a..86f76b9 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, -@@ -1084,6 +1089,7 @@ class Manager(object): - add_multipath_conf=False) +@@ -1084,5 +1089,6 @@ class Manager(object): # restore disabled hosts/resolv files bu.restore_resolv_conf(chroot) + bu.restore_newaliases(chroot) |