Commit 14edfde9 authored by Marco Mariani's avatar Marco Mariani

node register: write configuration with regexp, not configparser

this retains comments and avoids issues with unicode, multiline values
(certificates) etc.etc.
parent 1278aadc
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import ConfigParser
import getpass import getpass
import os import os
import re
import shutil import shutil
import stat import stat
import sys import sys
import tempfile
import subprocess import subprocess
import requests import requests
...@@ -173,15 +172,10 @@ def save_former_config(conf): ...@@ -173,15 +172,10 @@ def save_former_config(conf):
shutil.move(former, saved) shutil.move(former, saved)
def get_slapos_conf_example(): def fetch_configuration_template():
"""
Get slapos.cfg.example and return its path
"""
_, path = tempfile.mkstemp()
with open(path, 'wb') as fout:
req = requests.get('http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos.cfg.example') req = requests.get('http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos.cfg.example')
fout.write(req.content) req.raise_for_status()
return path return req.text
def slapconfig(conf): def slapconfig(conf):
...@@ -232,31 +226,28 @@ def slapconfig(conf): ...@@ -232,31 +226,28 @@ def slapconfig(conf):
config_path = os.path.join(slap_conf_dir, 'slapos.cfg') config_path = os.path.join(slap_conf_dir, 'slapos.cfg')
conf.logger.info('Creating slap configuration: %s', config_path) conf.logger.info('Creating slap configuration: %s', config_path)
# Get example configuration file cfg = fetch_configuration_template()
slapos_cfg_example = get_slapos_conf_example()
new_configp = ConfigParser.RawConfigParser() to_replace = [
new_configp.read(slapos_cfg_example) ('computer_id', conf.computer_id),
os.remove(slapos_cfg_example) ('master_url', conf.master_url),
('key_file', key_file),
for section, key, value in [ ('cert_file', cert_file),
('slapos', 'computer_id', conf.computer_id), ('certificate_repository_path', certificate_repository_path),
('slapos', 'master_url', conf.master_url), ('interface_name', conf.interface_name),
('slapos', 'key_file', key_file), ('ipv4_local_network', conf.ipv4_local_network),
('slapos', 'cert_file', cert_file), ('partition_amount', conf.partition_number),
('slapos', 'certificate_repository_path', certificate_repository_path), ('create_tap', conf.create_tap)
('slapformat', 'interface_name', conf.interface_name), ]
('slapformat', 'ipv4_local_network', conf.ipv4_local_network),
('slapformat', 'partition_amount', conf.partition_number),
('slapformat', 'create_tap', conf.create_tap)
]:
new_configp.set(section, key, value)
if conf.ipv6_interface: if conf.ipv6_interface:
new_configp.set('slapformat', 'ipv6_interface', conf.ipv6_interface) to_replace.append([('ipv6_interface', conf.ipv6_interface)])
for key, value in to_replace:
cfg = re.sub('%s\s+=.*' % key, '%s = %s' % (key, value), cfg)
if not dry_run: if not dry_run:
with open(config_path, 'w') as fout: with open(config_path, 'w') as fout:
new_configp.write(fout) fout.write(cfg.encode('utf8'))
conf.logger.info('SlapOS configuration written to %s', config_path) conf.logger.info('SlapOS configuration written to %s', config_path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment