patches/fuel-library/0000-Revert-Fix-building-ironic-bootstrap.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2017 Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Thu, 23 Mar 2017 15:57:02 +0100
  11 Subject: [PATCH] Revert "Fix building ironic bootstrap"
  12
  13 This reverts commit c90b8a2fab0b8deab06d75b93394f32c60963be7.
  14 ---
  15  .../manifests/provision/build_image.pp             | 34 +++++++++++-----------
  16  1 file changed, 17 insertions(+), 17 deletions(-)
  17
  18 diff --git a/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp b/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp
  19 index b40f3e2..02fa0f0 100644
  20 --- a/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp
  21 +++ b/deployment/puppet/osnailyfacter/manifests/provision/build_image.pp
  22 @@ -3,9 +3,7 @@ class osnailyfacter::provision::build_image {
  23    $data_file = "/var/lib/fuel/configs/${::cluster_id}/provision.yaml"
  24    $data = loadyaml($data_file)
  25
  26 -  if $data['ironic']['enabled'] == true {
  27 -    # TODO(vsaienko): Use the same system packages for fuel image and ironic bootstrap, but exclude
  28 -    # not needed for ironic like nailgun-agent, etc...
  29 +  if $data['ironic']['enabled'] == 'true' {
  30      $ironic_packages = [
  31        'openssh-server',
  32        'ntp',
  33 @@ -17,7 +15,9 @@ class osnailyfacter::provision::build_image {
  34        'squashfs-tools',
  35        'linux-firmware',
  36        'msmtp-mta',
  37 +      'hpsa-dkms',
  38        'i40e-dkms',
  39 +      'linux-firmware-nonfree',
  40        'xz-utils',
  41        'linux-headers-generic',
  42      ]
  43 @@ -29,25 +29,25 @@ class osnailyfacter::provision::build_image {
  44      $out_dir = "/var/www/nailgun/bootstrap/ironic/${::cluster_id}/"
  45      $out_params = "--output-dir ${out_dir}"
  46
  47 -    $ironic_extra_params = "--extra-dir /usr/share/ironic-fa-bootstrap-configs/ --no-compress --no-default-extra-dirs --no-default-packages"
  48 -    $ironic_log_params = '--log-file /var/log/fuel-ironic-bootstrap-image-build.log'
  49 +    $extra_params = "--extra-dir /usr/share/ironic-fa-bootstrap-configs/ --no-compress --no-default-extra-dirs --no-default-packages"
  50 +    $log_params = '--log-file /var/log/fuel-ironic-bootstrap-image-build.log'
  51
  52      exec { 'generate_image_with_ironic':
  53 -      command => "fuel-bootstrap build ${package_list} ${ssh_params} ${out_params} ${ironic_extra_params} ${ironic_log_params}",
  54 +      command => "fuel-bootstrap build ${package_list} ${ssh_params} ${out_params} ${extra_params} ${log_params}",
  55        path    => ['/bin', '/usr/bin'],
  56 -      timeout => 1800,
  57 -      unless  => "test -e /var/www/nailgun/bootstrap/ironic/${cluster_id}/vmlinuz",
  58 +      unless  => "test -e /var/www/nailgun/bootstrap/ironic/${::cluster_id}/vmlinuz",
  59      }
  60
  61 -  }
  62 -
  63 -  $build_dir = '--image_build_dir /var/lib/fuel/ibp'
  64 -  $log_params = "--log-file /var/log/fuel-agent-env-${cluster_id}.log"
  65 -  $extra_params = '--data_driver nailgun_build_image'
  66 +  } else {
  67 +    $build_dir = '--image_build_dir /var/lib/fuel/ibp'
  68 +    $log_params = "--log-file /var/log/fuel-agent-env-${::cluster_id}.log"
  69 +    $extra_params = '--data_driver nailgun_build_image'
  70
  71 -  exec { 'generate_image_with_fuel':
  72 -    command => "fa_build_image ${build_dir} ${log_params} ${extra_params} --input_data_file ${data_file}",
  73 -    path    => ['/bin', '/usr/bin'],
  74 -    timeout => 1800,
  75 +    exec { 'generate_image_with_fuel':
  76 +      command => "fa_build_image ${build_dir} ${log_params} ${extra_params} --input_data_file ${data_file}",
  77 +      path    => ['/bin', '/usr/bin'],
  78 +      timeout => 1800,
  79 +      unless  => "test -e /var/www/nailgun/bootstrap/ironic/${::cluster_id}/vmlinuz",
  80 +    }
  81    }
  82  }