On 07/30/2015 08:55 AM, Jan Cholasta wrote:
Dne 29.7.2015 v 17:43 Petr Vobornik napsal(a):
On 07/29/2015 05:13 PM, Martin Babinsky wrote:
On 07/29/2015 01:25 PM, Jan Cholasta wrote:
Dne 29.7.2015 v 12:20 Martin Babinsky napsal(a):
Initial attempt to implement
https://fedorahosted.org/freeipa/ticket/4517
Some points to discuss:
1.) name of the config entries: currently the option names are derived
from CLI options but have underscores in them instead of dashes. Maybe
keeping the CLI option names also for config entries will make it
easier
for the user to transfer their CLI options from scripts to config
files.
NACK. There is no point in generating config names from CLI names,
which
are generated from knob names - use knob names directly.
The problem is that in some cases the cli_name does not map directly to
knob name, leading in different naming of CLI options and config
entries, confusion and mayhem.
What works for CLI may not work for config files and vice versa. For
example, this works for CLI:
--no-ntp
--no-forwarders
--forwarder 1.2.3.4 --forwarder 5.6.7.8
but this works better in config file:
ntp = False
forwarders =
forwarders = 1.2.3.4, 5.6.7.8
These are some offenders from `ipaserver/install/server.py`:
http://fpaste.org/249424/18226114/
On the other hand, this can be an incentive to finally put an end to
inconsistent option/knob naming across server/replica/etc. installers.
Yes please.
If the names are different than cli names, then they should be made
discoverable somehow or be documented.
IMHO documenting them is easy.
2.) Config sections: there is currently only one valid section named
'[global]' in accordance with the format of 'default.conf'. Should we
have separate sections equivalent to option groups in CLI (e.g.
[basic],
[certificate system], [dns])?
No, because they would have to be maintained forever. For example, some
options are in wrong sections and we wouldn't be able to move them.
I'm also more inclined to a single section, at least for now since we
are pressed for time with this RFE.
That's not to say that we should ditch Alexander's idea about separate
sections with overrides for different hosts. We should consider it as a
future enhancement to this feature once the basic plumbing is in place.
Right.
3.) Handling of unattended mode when specifying a config file:
Currently there is no connection between --config-file and unattended
mode. So when you run ipa-server-install using config file, you still
get asked for missing stuff. Should '--config-file' automatically
imply
'--unattended'?
The behavior should be the same as if you specified the options on the
command line. So no, --config-file should not imply --unattended.
That sound reasonable. the code behaves this way already so no changes
here.
There are probably other issues to discuss. Feel free to write
email/ping me on IRC.
(I haven't looked at the patch yet.)
Please take a look at it ASAP. I am on PTO tomorrow and on Friday, but I
will find time to work at it in the evening if you send me you comments.
1) IMO the option should be in the top-level option section, not in a
separate group (use "parser.add_option()").
Also maybe rename it to --config, AFAIK that's what is usually used.
A short name ("-c"?) would be nice too.
Nitpick: if the option is named --config-file, dest should be
"config_file", to make it easier to look it up in the code.
2) Please don't duplicate the knob retrieval code, store knobs in a list
and pass that as an argument to parse_config_file.
3) I'm not sure about using newline as a list separator. I don't know
about other IPA components, but SSSD in particular uses commas, maybe we
should be consistent with that?
4) Booleans should be assignable either True or False, i.e. do not use
_parse_knob to parse them.
Honza
Attaching updated patch.
--
Martin^3 Babinsky
From c787830e833c96d522b5dfe22bb0a054857a901d Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabi...@redhat.com>
Date: Wed, 22 Jul 2015 13:55:26 +0200
Subject: [PATCH] IPA server and replica installers can accept options from
config file
New option '-c'/'--config' enables ipa-server-install and ipa-replica-install
to obtain parameters from supplied configuration file in INI format.
The file syntax is as follows:
* all options are listed in a single [global] section
* the option name can be derived from long CLI option name by replacing
dashes with underscores
* to specify multivalued parameter, assign a list of comma separated values
to a single option. Whitespace around commas is permitted.
Parameters specified explicitly through CLI options take precedence over the
values contained in config file.
In the case of unknown options present in the config file, the installer will
raise an error listing them.
https://fedorahosted.org/freeipa/ticket/4517
---
ipapython/install/cli.py | 83 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 82 insertions(+), 1 deletion(-)
diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py
index 1ba9a815c4c499dff0e7974f399f2de31eb932cd..cf10134bcfe8bfc2101a8f0f2c82b51af5422dbb 100644
--- a/ipapython/install/cli.py
+++ b/ipapython/install/cli.py
@@ -9,6 +9,7 @@ Command line support.
import collections
import optparse
import signal
+from ConfigParser import ConfigParser, NoOptionError
from ipapython import admintool, ipa_log_manager
from ipapython.ipautil import CheckedIPAddress, private_ccache
@@ -148,6 +149,15 @@ class ConfigureTool(admintool.AdminTool):
for group, opt_group in groups.iteritems():
parser.add_option_group(opt_group)
+ parser.add_option(
+ "-c",
+ "--config",
+ dest='config',
+ default=None,
+ metavar='FILE',
+ help="get installer specific options from config file"
+ )
+
super(ConfigureTool, cls).add_options(parser,
debug_option=cls.debug_option)
@@ -275,7 +285,16 @@ class ConfigureTool(admintool.AdminTool):
kwargs = {}
transformed_cls = self._transform(self.configurable_class)
- for owner_cls, name in transformed_cls.knobs():
+ knob_list = [(owner_cls, name) for owner_cls, name
+ in transformed_cls.knobs()]
+
+ if self.options.config is not None:
+ values_from_config = self.parse_config_file(
+ knob_list,
+ self.options.config)
+ kwargs.update(values_from_config)
+
+ for owner_cls, name in knob_list:
value = getattr(self.options, name, None)
if value is not None:
kwargs[name] = value
@@ -311,6 +330,68 @@ class ConfigureTool(admintool.AdminTool):
def __signal_handler(signum, frame):
raise KeyboardInterrupt
+ def parse_config_file(self, knob_list, filename):
+ config_parser = ConfigParser()
+
+ with open(filename, 'r') as f:
+ config_parser.readfp(f)
+
+ # use single section name for now
+ section_name = 'global'
+ config_entries = {x for x in config_parser.options(section_name)}
+
+ result = {}
+
+ for owner_cls, name in knob_list:
+ knob_cls = getattr(owner_cls, name)
+
+ entry_name = (knob_cls.cli_name.replace('-', '_')
+ if knob_cls.cli_name is not None else name)
+ try:
+ config_entries.remove(entry_name)
+ except KeyError:
+ continue
+
+ try:
+ result[name] = self._value_from_config(knob_cls,
+ config_parser,
+ section_name,
+ entry_name)
+ except ValueError as e:
+ raise RuntimeError(
+ "In config file '{0}': {1}".format(
+ filename, e)
+ )
+
+ # check for unrecognized entries left and raise an error
+ if config_entries:
+ raise RuntimeError(
+ "In config file '{0}':\n\tUnrecognized entries: {1}".format(
+ filename, ', '.join([x for x in config_entries])
+ )
+ )
+
+ return result
+
+ def _value_from_config(self, knob_cls, parser, section, option):
+ # since ConfigParser does not by default support
+ # multi-valued entries, we will split multi-line entries
+ # into list of values when multi-valued Knob is detected
+ if isinstance(knob_cls.type, tuple) and knob_cls.type[0] == list:
+ config_value = parser.get(section, option).split(',')
+ config_value = [i.strip() for i in config_value]
+ new_value = []
+ for v in config_value:
+ new_value = self._parse_knob(
+ knob_cls, new_value, v)
+ elif knob_cls.type is bool:
+ new_value = parser.getboolean(section, option)
+ else:
+ new_value = self._parse_knob(knob_cls, None,
+ parser.get(section, option))
+
+ return new_value
+
class InstallTool(ConfigureTool):
uninstall_kwargs = None
--
2.4.3
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
