Merge "Adapt compass4nfv scripts to new compass-deck"

1 files changed, 6 insertions, 8 deletions

diff --git a/deploy/client.py b/deploy/client.py
index e612160b..3a9b0dec 100644
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -79,8 +79,8 @@ opts = [
     cfg.BoolOpt('poll_switches',
                 help='if the client polls switches',
                 default=True),
-    cfg.StrOpt('machines',
-               help='comma separated mac addresses of machines',
+    cfg.StrOpt('machine_file',
+               help='mac addresses and ipmi info of machines',
                default=''),
     cfg.StrOpt('subnets',
                help='comma seperated subnets',
@@ -327,12 +327,12 @@ class CompassClient(object):
                 'get all machines status: %s, resp: %s', status, resp)
             raise RuntimeError('failed to get machines')
 
-        machines_to_add = list(set([
-            machine for machine in CONF.machines.split(',')
-            if machine
-        ]))
+        with open(CONF.machine_file) as fd:
+            machines_to_add = [str(m["mac"]) for m in yaml.load(fd)]
 
+        resp = byteify(resp)
         machines_db = [str(m["mac"]) for m in resp]
+
         LOG.info(
             'machines in db: %s\n to add: %s',
             machines_db,
@@ -983,8 +983,6 @@ class CompassClient(object):
         ansible_log = "%s/work/deploy/docker/ansible/run/%s-%s/ansible.log" \
                       % (compass_dir, CONF.adapter_name, CONF.cluster_name)
         os.system("sudo touch %s" % ansible_log)
-        os.system("sudo chmod +x -R %s/work/deploy/docker/ansible/run/"
-                  % compass_dir)
         ansible_print = multiprocessing.Process(target=print_log,
                                                 args=(ansible_log,))
         ansible_print.start()