diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-25 20:01:48 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-29 15:06:58 +0000 |
| commit | 0ab944bc6e9666dc94d25f8bb7122955a06aa4cb (patch) | |
| tree | 0178eb773e14fac3d8134552c0be79d802bcc395 /patches/fuel-library/multiarch-fuel | |
| parent | 7d03950d2685185b93fbad50a23ed6cf7c638f00 (diff) | |
f-l: Refresh after upstream reverted cobbler rm
Remove our revert patches since upstream applied the same changes.
Update patch context where needed.
JIRA: ARMBAND-237
Change-Id: I6007484ad23f0fceabd8f8ec7625e598aee280c7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 71b44345b89e802c549d3415da65b5502effbaeb)
Diffstat (limited to 'patches/fuel-library/multiarch-fuel')
| -rw-r--r-- | patches/fuel-library/multiarch-fuel/0003-build_image.pp-Extract-cluster_arch-from-URI.patch | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/patches/fuel-library/multiarch-fuel/0003-build_image.pp-Extract-cluster_arch-from-URI.patch b/patches/fuel-library/multiarch-fuel/0003-build_image.pp-Extract-cluster_arch-from-URI.patch index b2291eed..2311442b 100644 --- a/patches/fuel-library/multiarch-fuel/0003-build_image.pp-Extract-cluster_arch-from-URI.patch +++ b/patches/fuel-library/multiarch-fuel/0003-build_image.pp-Extract-cluster_arch-from-URI.patch @@ -35,7 +35,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp b/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp -index 3f90aec..c1b8fbe 100644 +index dbfc785..8525e33 100644 --- a/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp +++ b/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp @@ -8,6 +8,9 @@ class osnailyfacter::provision::build_image( @@ -46,17 +46,16 @@ index 3f90aec..c1b8fbe 100644 + $root_img_suffix_split = split($root_img_uri_split[-1], '[.]') + $cluster_arch = $root_img_suffix_split[0] - if $data['ironic']['enabled'] == 'true' { - $ironic_packages = [ -@@ -50,9 +53,9 @@ class osnailyfacter::provision::build_image( - $extra_params = '--data_driver nailgun_build_image' - - exec { 'generate_image_with_fuel': -- command => "fa_build_image ${build_dir} ${log_params} ${extra_params} --input_data_file ${data_file}", -+ command => "fa_build_image ${build_dir} ${log_params} ${extra_params} --target_arch=${cluster_arch} --input_data_file ${data_file}", - path => ['/bin', '/usr/bin'], -- timeout => 1800, -+ timeout => 3600, - unless => "test -e /var/www/nailgun/bootstrap/ironic/${cluster_id}/vmlinuz", - } + if $data['ironic']['enabled'] == true { + # TODO(vsaienko): Use the same system packages for fuel image and ironic bootstrap, but exclude +@@ -52,8 +55,8 @@ class osnailyfacter::provision::build_image( + $extra_params = '--data_driver nailgun_build_image' + + exec { 'generate_image_with_fuel': +- command => "fa_build_image ${build_dir} ${log_params} ${extra_params} --input_data_file ${data_file}", ++ command => "fa_build_image ${build_dir} ${log_params} ${extra_params} --target_arch=${cluster_arch} --input_data_file ${data_file}", + path => ['/bin', '/usr/bin'], +- timeout => 1800, ++ timeout => 3600, } + } |