Merge "Auto deploy corrections for Fuel 9.0"

[fuel.git] / deploy / reap.py

diff --git a/deploy/reap.py b/deploy/reap.py
old mode 100755 (executable)
new mode 100644 (file)
index 2155f3f..1262d4c
--- a/deploy/reap.py
+++ b/deploy/reap.py
@@ -14,6 +14,7 @@ import os
 import yaml
 import glob
 import shutil
+import tempfile
 
 from common import (
     N,
@@ -73,9 +74,9 @@ DHA_2 = '''
 # which may not be correct - please adjust as needed.
 '''
 
-DISKS = {'fuel': '50G',
-         'controller': '60G',
-         'compute': '50G'}
+DISKS = {'fuel': '100G',
+         'controller': '100G',
+         'compute': '100G'}
 
 
 class Reap(object):
@@ -91,8 +92,10 @@ class Reap(object):
 
     def get_env(self):
         env_list = parse(exec_cmd('fuel env'))
-        if len(env_list) > 1:
-            err('Not exactly one environment')
+        if len(env_list) == 0:
+            err('No environment deployed')
+        elif len(env_list) > 1:
+            err('More than 1 environment deployed')
         self.env = env_list[0]
         self.env_id = self.env[E['id']]
 
@@ -134,9 +137,8 @@ class Reap(object):
 
     def reap_transformation(self, node_id, roles, transformations):
         main_role = 'controller' if 'controller' in roles else 'compute'
-        node_file = glob.glob('%s/deployment_%s/*%s_%s.yaml'
-                              % (self.temp_dir, self.env_id,
-                                 main_role, node_id))
+        node_file = glob.glob('%s/deployment_%s/%s.yaml'
+                              % (self.temp_dir, self.env_id, node_id))
         tr_name = None
         with open(node_file[0]) as f:
             node_config = yaml.load(f)
@@ -220,13 +222,8 @@ class Reap(object):
                         % (self.temp_dir, self.env_id))
         network = self.read_yaml(network_file)
 
-        # ha_compact not understood by Fuel when deploying...OD
-        if self.env[E['mode']] == 'ha_compact':
-            self.env[E['mode']] = 'ha'
-
         env = {'environment':
                    {'name': self.env[E['name']],
-                    'mode': self.env[E['mode']],
                     'net_segment_type':
                         network['networking_parameters']['segmentation_type']}}
         self.write_yaml(self.dea_file, env)
@@ -294,7 +291,7 @@ class Reap(object):
     def intro(self):
         delete(self.dea_file)
         delete(self.dha_file)
-        self.temp_dir = exec_cmd('mktemp -d')
+        self.temp_dir = tempfile.mkdtemp()
         date = time.strftime('%c')
         self.write(self.dea_file,
                    DEA_1.format(date=date, comment=self.comment), False)