aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-09-13 09:48:13 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-13 09:48:14 +0000
commit414973688bf8876685168434d0612fbde5f24dd6 (patch)
tree97ef2f9e4f89fda41b09432e9886f0d4313a23a7
parent0f5a1854028e33fa77127ffc65077058fa3b9469 (diff)
parentff26503f13676b7551afc0633621786edd2811f0 (diff)
Merge "Don't fork a templater process, use the library"
-rw-r--r--deploy/reap.py9
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)