X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=deploy%2Fdeploy.py;h=f491929e08189dea7e612586a8e234e52eaa13af;hb=414973688bf8876685168434d0612fbde5f24dd6;hp=0d406412c596b0e584a2ab7d9f76cdf861f6e7d3;hpb=105b4bb28e91bcce95b695c2e842fc44a05756ef;p=fuel.git

diff --git a/deploy/deploy.py b/deploy/deploy.py
index 0d406412c..f491929e0 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -30,6 +30,7 @@ from common import (
     err,
     warn,
     check_file_exists,
+    check_dir_exists,
     create_dir_if_not_exists,
     delete,
     check_if_root,
@@ -61,7 +62,7 @@ class AutoDeploy(object):
     def __init__(self, no_fuel, fuel_only, no_health_check, cleanup_only,
                  cleanup, storage_dir, pxe_bridge, iso_file, dea_file,
                  dha_file, fuel_plugins_dir, fuel_plugins_conf_dir,
-                 no_plugins, deploy_timeout, no_deploy_environment):
+                 no_plugins, deploy_timeout, no_deploy_environment, deploy_log):
         self.no_fuel = no_fuel
         self.fuel_only = fuel_only
         self.no_health_check = no_health_check
@@ -77,6 +78,7 @@ class AutoDeploy(object):
         self.no_plugins = no_plugins
         self.deploy_timeout = deploy_timeout
         self.no_deploy_environment = no_deploy_environment
+        self.deploy_log = deploy_log
         self.dea = (DeploymentEnvironmentAdapter(dea_file)
                     if not cleanup_only else None)
         self.dha = DeploymentHardwareAdapter(dha_file)
@@ -107,6 +109,20 @@ class AutoDeploy(object):
         self.iso_file = new_iso
         self.install_iso()
 
+    def delete_old_fuel_env(self):
+        log('Delete old Fuel Master environments if present')
+        try:
+            old_dep = CloudDeploy(self.dea, self.dha, self.fuel_conf['ip'],
+                                  self.fuel_username, self.fuel_password,
+                                  self.dea_file, self.fuel_plugins_conf_dir,
+                                  WORK_DIR, self.no_health_check,
+                                  self.deploy_timeout,
+                                  self.no_deploy_environment, self.deploy_log)
+            with old_dep.ssh:
+                old_dep.check_previous_installation()
+        except Exception as e:
+            log('Could not delete old env: %s' % str(e))
+
     def install_iso(self):
         fuel = InstallFuelMaster(self.dea_file, self.dha_file,
                                  self.fuel_conf['ip'], self.fuel_username,
@@ -162,9 +178,12 @@ class AutoDeploy(object):
             exec_cmd('mkisofs -quiet -r -J -R -b %s '
                      '-no-emul-boot -boot-load-size 4 '
                      '-boot-info-table -hide-rr-moved '
+                     '-joliet-long '
                      '-x "lost+found:" -V %s -o %s .'
                      % (iso_linux_bin, iso_label, new_iso))
 
+        delete(tmp_new_dir)
+
     def update_fuel_isolinux(self, file):
         with io.open(file) as f:
             data = f.read()
@@ -200,7 +219,7 @@ class AutoDeploy(object):
                           self.fuel_username, self.fuel_password,
                           self.dea_file, self.fuel_plugins_conf_dir,
                           WORK_DIR, self.no_health_check, self.deploy_timeout,
-                          self.no_deploy_environment)
+                          self.no_deploy_environment, self.deploy_log)
         return dep.deploy()
 
     def setup_execution_environment(self):
@@ -221,6 +240,7 @@ class AutoDeploy(object):
     def deploy(self):
         self.collect_fuel_info()
         if not self.no_fuel:
+            self.delete_old_fuel_env()
             self.setup_execution_environment()
             self.create_tmp_dir()
             self.install_fuel_master()
@@ -243,6 +263,11 @@ class AutoDeploy(object):
 
 
 def check_bridge(pxe_bridge, dha_path):
+    # Assume that bridges on remote nodes exists, we could ssh but
+    # the remote user might not have a login shell.
+    if os.environ.get('LIBVIRT_DEFAULT_URI'):
+        return
+
     with io.open(dha_path) as yaml_file:
         dha_struct = yaml.load(yaml_file)
     if dha_struct['adapter'] != 'libvirt':
@@ -309,8 +334,8 @@ def parse_arguments():
     parser.add_argument('-s', dest='storage_dir', action='store',
                         default='%s/images' % CWD,
                         help='Storage Directory [default: images]')
-    parser.add_argument('-b', dest='pxe_bridge', action='store',
-                        default='pxebr',
+    parser.add_argument('-b', dest='pxe_bridge', action='append',
+                        default=[],
                         help='Linux Bridge for booting up the Fuel Master VM '
                              '[default: pxebr]')
     parser.add_argument('-p', dest='fuel_plugins_dir', action='store',
@@ -325,12 +350,20 @@ def parse_arguments():
     parser.add_argument('-nde', dest='no_deploy_environment',
                         action='store_true', default=False,
                         help=('Do not launch environment deployment'))
+    parser.add_argument('-log', dest='deploy_log',
+                        action='store', default='../ci/.',
+                        help=('Path and name of the deployment log archive'))
 
     args = parser.parse_args()
     log(args)
 
+    if not args.pxe_bridge:
+        args.pxe_bridge = ['pxebr']
+
     check_file_exists(args.dha_file)
 
+    check_dir_exists(os.path.dirname(args.deploy_log))
+
     if not args.cleanup_only:
         check_file_exists(args.dea_file)
         check_fuel_plugins_dir(args.fuel_plugins_dir)
@@ -341,7 +374,9 @@ def parse_arguments():
         check_file_exists(iso_abs_path)
         log('Using image directory: %s' % args.storage_dir)
         create_dir_if_not_exists(args.storage_dir)
-        check_bridge(args.pxe_bridge, args.dha_file)
+        for bridge in args.pxe_bridge:
+            check_bridge(bridge, args.dha_file)
+
 
     kwargs = {'no_fuel': args.no_fuel, 'fuel_only': args.fuel_only,
               'no_health_check': args.no_health_check,
@@ -353,7 +388,8 @@ def parse_arguments():
               'fuel_plugins_conf_dir': args.fuel_plugins_conf_dir,
               'no_plugins': args.no_plugins,
               'deploy_timeout': args.deploy_timeout,
-              'no_deploy_environment': args.no_deploy_environment}
+              'no_deploy_environment': args.no_deploy_environment,
+              'deploy_log': args.deploy_log}
     return kwargs