meissa/dda-devops-build
6
1
Fork 0
Code Issues Pull requests Projects Releases 33 Packages Wiki Activity

fix dda-pallet

Browse source
This commit is contained in:
jem 2020-04-17 19:08:18 +02:00
parent 379eedc132
commit ba3112ac47
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/python/ddadevops/dda_pallet_mixin.py
View file

@ -38,29 +38,29 @@ class DdaPalletMixin(DevopsBuild):
run('cp *.edn ' + self.build_path(), shell=True) run('cp *.edn ' + self.build_path(), shell=True)
def dda_write_target(self, node_name, ipv4): def dda_write_target(self, node_name, ipv4):
with open(self.build_path() + self.target_edn_name, "w") as output_file: with open(self.build_path() + '/' + self.target_edn_name, "w") as output_file:
output_file.write( output_file.write(
self.target_template.substitute({'ipv4': ipv4, 'node_name': node_name})) self.target_template.substitute({'ipv4': ipv4, 'node_name': node_name}))
def dda_write_domain(self, substitues): def dda_write_domain(self, substitues):
with open(self.build_path() + self.domain_file_name, "r") as input_file: with open(self.build_path() + '/' + self.domain_file_name, "r") as input_file:
domain_input=input_file.read() domain_input=input_file.read()
domain_template=Template(domain_input) domain_template=Template(domain_input)
with open(self.build_path() + 'out_' + self.domain_file_name, "w") as output_file: with open(self.build_path() + '/out_' + self.domain_file_name, "w") as output_file:
output_file.write(domain_template.substitute(substitues)) output_file.write(domain_template.substitute(substitues))
def dda_uberjar(self, configure_switch = None): def dda_uberjar(self, configure_switch = None):
if configure_switch: if configure_switch:
cmd=['java', '-jar', self.project_root_path() + self.jar_file, cmd=['java', '-jar', self.project_root_path + '/' + self.jar_file,
'--targets', self.build_path() + self.target_edn_name, '--targets', self.build_path() + '/' + self.target_edn_name,
'--tenant', self.tenant, '--application', self.application, '--tenant', self.tenant, '--application', self.application,
'--configure', '--configure',
self.build_path() + 'out_' + self.domain_file_name] self.build_path() + '/out_' + self.domain_file_name]
else: else:
cmd = ['java', '-jar', self.project_root_path() + self.jar_file, cmd = ['java', '-jar', self.project_root_path + '/' + self.jar_file,
'--targets', self.build_path() + self.target_edn_name, '--targets', self.build_path() + '/' + self.target_edn_name,
'--tenant', self.tenant, '--application', self.application, '--tenant', self.tenant, '--application', self.application,
self.build_path() + 'out_' + self.domain_file_name] self.build_path() + '/out_' + self.domain_file_name]
prn_cmd = list(cmd) prn_cmd = list(cmd)
print(" ".join(prn_cmd)) print(" ".join(prn_cmd))
output = execute(cmd) output = execute(cmd)