diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-09-26 16:48:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-26 16:48:44 +0000 |
| commit | d198db7f42da2915f506e7d679d47823eda58b2a (patch) | |
| tree | eacb3ab749662774795fb345af64631848ae4882 | |
| parent | c751ac064c2e9ae41caef6e529a3c39d733bfcf5 (diff) | |
| parent | 9bd324ce5ef99bafceb6221ef9d3e8a5ea937c7d (diff) | |
Merge "Don't fork a templater process, use the library" into stable/colorado
| -rw-r--r-- | deploy/reap.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/deploy/reap.py b/deploy/reap.py index eb02fe25d..69c98d10c 100644 --- a/deploy/reap.py +++ b/deploy/reap.py @@ -18,6 +18,7 @@ import shutil import tempfile import re import netaddr +import templater from common import ( N, @@ -79,8 +80,6 @@ DHA_2 = ''' # which may not be correct - please adjust as needed. ''' -TEMPLATER = 'templater.py' - DISKS = {'fuel': '100G', 'controller': '100G', 'compute': '100G'} @@ -353,8 +352,10 @@ class Reap(object): self.download_config('network') def create_base_dea(self): - exec_cmd('python %s %s %s %s' - % (TEMPLATER, self.dea_file, self.template, self.base_dea)) + templater = templater.Templater(self.dea_file, + self.template, + self.base_dea) + templater.run() def finale(self): log('DEA file is available at %s' % self.dea_file) |