Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rebase yardstick to stable/danube
[fuel.git]
/
deploy
/
reap.py
diff --git
a/deploy/reap.py
b/deploy/reap.py
index
eb02fe2
..
69c98d1
100644
(file)
--- a/
deploy/reap.py
+++ b/
deploy/reap.py
@@
-18,6
+18,7
@@
import shutil
import tempfile
import re
import netaddr
import tempfile
import re
import netaddr
+import templater
from common import (
N,
from common import (
N,
@@
-79,8
+80,6
@@
DHA_2 = '''
# which may not be correct - please adjust as needed.
'''
# which may not be correct - please adjust as needed.
'''
-TEMPLATER = 'templater.py'
-
DISKS = {'fuel': '100G',
'controller': '100G',
'compute': '100G'}
DISKS = {'fuel': '100G',
'controller': '100G',
'compute': '100G'}
@@
-353,8
+352,10
@@
class Reap(object):
self.download_config('network')
def create_base_dea(self):
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)
def finale(self):
log('DEA file is available at %s' % self.dea_file)