X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=deploy%2Freap.py;h=bf64d405a683f1a8f02cf77e202f46a51215a9c3;hb=cf3a69c270f65bec42d5bb28872455cbbc79c575;hp=2155f3faa60fc3be488976be06d00b9d611d6117;hpb=90722b2a0de85d9b60130883b1b4f7b0e21dcffd;p=fuel.git diff --git a/deploy/reap.py b/deploy/reap.py index 2155f3faa..bf64d405a 100755 --- 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): @@ -220,13 +221,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 +290,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)