patches/opnfv-fuel/0007-deploy-Fix-add-bootstrap-DEA-override-delay.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: Wed, 17 Aug 2016 16:18:26 +0200
  11 Subject: [PATCH] deploy: Fix/add bootstrap DEA override delay
  12
  13 Previous change adding support for DEA to override bootstrap config
  14 did not account for slow execution on remote servers, so add a
  15 one minute sleep before checking for completition of fuel install.
  16
  17 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  18 ---
  19  deploy/install_fuel_master.py | 4 +++-
  20  1 file changed, 3 insertions(+), 1 deletion(-)
  21
  22 diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py
  23 index 808d0b1..1a7685a 100644
  24 --- a/deploy/install_fuel_master.py
  25 +++ b/deploy/install_fuel_master.py
  26 @@ -196,11 +196,13 @@ class InstallFuelMaster(object):
  27                       self.work_dir, os.path.basename(self.dea_file)))
  28
  29      def wait_until_installation_completed(self):
  30 -        WAIT_LOOP = 360
  31 +        WAIT_LOOP = 720
  32          SLEEP_TIME = 10
  33          CMD = 'pgrep -f %s' % BOOTSTRAP_ADMIN
  34
  35          install_completed = False
  36 +        time.sleep(60)
  37 +        self.wait_for_node_up()
  38          with self.ssh:
  39              for i in range(WAIT_LOOP):
  40                  ret = self.ssh.exec_cmd(CMD)