deploy: Fix ssh timeouts after yaml inject

JIRA: ARMBAND-59

Change-Id: I031e1c20bcb7d5bb15b26dce18364a4994f4d0d7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/opnfv-fuel/0039-deploy-Allow-DEA-to-override-bootstrap-config.patch b/patches/opnfv-fuel/0039-deploy-Allow-DEA-to-override-bootstrap-config.patch
index 310d1d5..2d1013a 100644 (file)
--- a/patches/opnfv-fuel/0039-deploy-Allow-DEA-to-override-bootstrap-config.patch
+++ b/patches/opnfv-fuel/0039-deploy-Allow-DEA-to-override-bootstrap-config.patch
@@ -14,15 +14,15 @@ JIRA: FUEL-155
 Change-Id: I4e66b789fdf0a5b1af512a3efc84fedb72ce3b05
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- deploy/install_fuel_master.py      |  6 +++---
- deploy/transplant_fuel_settings.py | 17 +++++++++++++++++
- 2 files changed, 20 insertions(+), 3 deletions(-)
+ deploy/install_fuel_master.py      |  7 ++++---
+ deploy/transplant_fuel_settings.py | 20 +++++++++++++++++++-
+ 2 files changed, 23 insertions(+), 4 deletions(-)
 
 diff --git a/deploy/install_fuel_master.py b/deploy/install_fuel_master.py
-index 5adccef..808d0b1 100644
+index 5adccef..adadcb5 100644
 --- a/deploy/install_fuel_master.py
 +++ b/deploy/install_fuel_master.py
-@@ -84,8 +84,8 @@ class InstallFuelMaster(object):
+@@ -84,14 +84,15 @@ class InstallFuelMaster(object):
          log('Wait until Fuel menu is up')
          fuel_menu_pid = self.wait_until_fuel_menu_up()
  
@@ -33,7 +33,14 @@ index 5adccef..808d0b1 100644
  
          log('Let the Fuel deployment continue')
          log('Found FUEL menu as PID %s, now killing it' % fuel_menu_pid)
-@@ -181,7 +181,7 @@ class InstallFuelMaster(object):
+         self.ssh_exec_cmd('kill %s' % fuel_menu_pid, False)
+ 
+         log('Wait until installation is complete')
++        time.sleep(60)
+         self.wait_until_installation_completed()
+ 
+         log('Waiting for one minute for Fuel to stabilize')
+@@ -181,7 +182,7 @@ class InstallFuelMaster(object):
              ret = self.ssh.exec_cmd(cmd, check=check)
          return ret
  
@@ -43,10 +50,10 @@ index 5adccef..808d0b1 100644
              s.exec_cmd('rm -rf %s' % self.work_dir, False)
              s.exec_cmd('mkdir %s' % self.work_dir)
 diff --git a/deploy/transplant_fuel_settings.py b/deploy/transplant_fuel_settings.py
-index e57a4fb..318c633 100644
+index 9a65cf6..8684d57 100644
 --- a/deploy/transplant_fuel_settings.py
 +++ b/deploy/transplant_fuel_settings.py
-@@ -18,6 +18,7 @@ from common import (
+@@ -22,6 +22,7 @@ from common import (
  )
  
  ASTUTE_YAML = '/etc/fuel/astute.yaml'
@@ -54,7 +61,7 @@ index e57a4fb..318c633 100644
  
  
  def usage():
-@@ -47,18 +48,35 @@ def transplant(dea, astute):
+@@ -81,9 +82,19 @@ def transplant(dea, astute):
      return astute
  
  
@@ -74,8 +81,7 @@ index e57a4fb..318c633 100644
      dea = DeploymentEnvironmentAdapter(dea_file)
      log('Reading astute file %s' % ASTUTE_YAML)
      with io.open(ASTUTE_YAML) as stream:
-         astute = yaml.load(stream)
-     log('Initiating transplant')
+@@ -92,7 +103,14 @@ def main():
      transplant(dea, astute)
      with io.open(ASTUTE_YAML, 'w') as stream:
          yaml.dump(astute, stream, default_flow_style=False)