summaryrefslogtreecommitdiffstats
path: root/tools/conf
Commit message (Collapse)AuthorAgeFilesLines
* Remove bin lookup in conf sample generatorZhongyue Luo2013-06-141-7/+1
| | | | | | | As of 584b2f, the bin directory has been removed. No longer need to handle bin/ Change-Id: Ic5013cd27d7e420a6a01d207546f7ac0258d62d1
* Refactor conf sample generator scriptZhongyue Luo2013-06-141-6/+8
| | | | | | | Optimized grep calls to not create a grep process per file. Defined variables to enhance readability. Change-Id: Ic873f2c3b600a737ce54444dec973720c8813285
* Merge "Enhance group handling in extract_opts"Jenkins2013-06-102-271/+4
|\
| * Enhance group handling in extract_optsJulien Danjou2013-06-102-271/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When there's 2 options with the same name, the script gets confused and doesn't know in which group it goes. This fixes it, and fixes also the template generation which is broken for various reasons: - gettext.install was missing - nova-rootwrap when imported calls exit() because it doesn't find a valid configuration file, so let's exclude it entirely anyway - eventlet/greendns needs to be ignored for this Change-Id: Iaa4e9a806e79032ce1675b46a6b7a7628c3eff89 Signed-off-by: Julien Danjou <julien@danjou.info>
* | Update analyze_opts to work with new nova.conf sample formatJoe Gordon2013-06-071-2/+2
|/ | | | | | | analyze_opts is a tool to help clean out a nova.conf file by checking for unused and default values set in your nova.conf Change-Id: I01fff134f8906bff929c55bea8c152653d3e9760
* Improve Python 3.x compatibilityDirk Mueller2013-06-011-3/+3
| | | | | | | | | Mechanical translation of the deprecated except x,y: construct with except x as y: The latter works with any Python >= 2.6. Add Hacking check. Change-Id: I845829d97d379c1cd9b3a77e7e5786586f263b64
* Regenerate nova.conf.sampleMark McLoughlin2013-03-012-7/+26
| | | | | | | | Fix generate_sample.sh script so that we include options from the bin/ scripts too. In order to make this work, sync a zmq-receive fix from oslo-incubator to delay parsing its config file. Change-Id: Ia3f9083b2ebc16425dbad8a2a55c2d45f1ff2be3
* Use oslo-config-2013.1b4Mark McLoughlin2013-02-192-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The cfg API is now available via the oslo-config library, so switch to it and remove the copied-and-pasted version. Add the 2013.1b4 tarball to tools/pip-requires - this will be changed to 'oslo-config>=2013.1' when oslo-config is published to pypi. This will happen in time for grizzly final. Add dependency_links to setup.py so that oslo-config can be installed from the tarball URL specified in pip-requires. Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already does for paste. It turns out imp.find_module() doesn't correct handle namespace packages. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
* Merge "Sync latest cfg from oslo-incubator"Jenkins2013-01-231-4/+0
|\
| * Sync latest cfg from oslo-incubatorMark McLoughlin2013-01-211-4/+0
| | | | | | | | | | | | | | | | | | | | The main change is: c5984ba Move logging config options into the log module Re-generate nova.conf.sample to reflect the options move. Change-Id: I3913ea54465658d93dc56e014dfe5d911b0541d6
* | Cleanup of extract_opts.pyZhongyue Luo2013-01-221-17/+14
|/ | | | | | | | Moved global variables to the top. Removed once used variables Used option type definitions in OPT_TYPES Change-Id: Ia0bf39933bac84dbf432e6b4590ceb2527e6889c
* Try out a new nova.conf.sample formatMark McLoughlin2013-01-101-17/+22
| | | | | | | | | | | | | | | The current format strikes me as fairly bizarre: - Having the help message after the option it's documenting seems backwards to me. Compare to the glance or swift samples. - Printing the type as e.g. "(StrOpt)" isn't very user friendly - We're creating a global pound symbol shortage Switch to a new format that looks much more like a normal config file. Change-Id: Ifba0a181667f3b81cad400f1cdd3812e388a9d64
* Regenerate nova.conf.sampleMark McLoughlin2013-01-101-21/+90
| | | | | | | | Some pretty monstrous hacking in the extraction tool is required to guess the group which options are in. It was pretty hacky to begin with though. Change-Id: Ie93dcfc82ab19af4e3cb7090bbb03d9efee83aa2
* Import cfg module in extract_opts.py.Dan Prince2012-12-181-0/+1
| | | | | | | | | | Updates the tools/conf/extract_opts.py module so it imports cfg again. Fixes "global name 'cfg' is not defined" errors which occur without it. Change-Id: Idf7c2c5201c79e7aa359bc555306caadebcc18ce
* Remove nova.config.CONFMark McLoughlin2012-11-201-1/+0
| | | | | | | | | | | | | | | Modules import nova.config for two reasons right now - firstly, to reference nova.config.CONF and, secondly, if they use one of the options defined in nova.config. Often modules import nova.openstack.common.cfg and nova.config which is a bit pointless since they could just use cfg.CONF if they just want to nova.config in order to reference CONF. Let's just use cfg.CONF everywhere and we can explicitly state where we actually require options defined in nova.config. Change-Id: Ie4184a74e3e78c99658becb18dce1c2087e450bb
* Replaced default hostname function from gethostname to getfqdnLuis Fernandez Alvarez2012-09-261-1/+1
| | | | | | | | | | | | | | Fixes bug 1055503 The standard behaviour of the 'gethostname' function in Python differs from Linux to Windows. A common Linux configuration returns the FQDN, while a Windows one returns only the host name. To resolve inconsistent node naming in deployments that mix windows and Linux, it is proposed to use 'getfqdn' as default function instead of 'gethostname'. This is function is more predictable in all cases. Change-Id: I3164d9a36df2b8484bbf9a57879c31fa0e342503
* Added script to find unused config options.Yosef Berman2012-09-182-1/+92
| | | | | | | The script analyze_opts.py is added to identify unused options and options which are set to default values in the nova.conf file. Change-Id: Iec42781a56f73b7d0960bdd569f5dd06edbb88df
* Merge "Ensure log formats are quoted in sample conf"Jenkins2012-08-241-0/+2
|\
| * Ensure log formats are quoted in sample confMark McLoughlin2012-08-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1040583 This ensures the sample conf has: # instance_format="[instance: %(uuid)s] " rather than: # instance_format=[instance: %(uuid)s] Fix suggested by Vish. Change-Id: If20aa7276d6868a6885abc85f046733adc40331f DocImpact: update nova.conf docs
* | Merge "Don't include hostname and IP in generated sample conf"Jenkins2012-08-241-6/+26
|\|
| * Don't include hostname and IP in generated sample confMark McLoughlin2012-08-231-6/+26
| | | | | | | | | | | | | | Avoid including the hostname and IP address of the machine generating the sample config file. Change-Id: Idf791efef8b0bf760c4c95f6f5f53d20bdf5ee7a
* | Merge "Allow generate_sample.sh to be run from toplevel dir"Jenkins2012-08-233-8/+17
|\ \
| * | Allow generate_sample.sh to be run from toplevel dirMark McLoughlin2012-08-233-8/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | I hit an issue where extract_opts.py couldn't import importutils since it's not in my sys.path, so it's clear we need to set PYTHONPATH before running. The whole business of running the tool from the tools/conf dir is fairly awkward, so change it to run from the top-level dir instead. Change-Id: I89b4d874a6ee3732234a9704a8ee6001a293ed71
* / Include CommonConfigOpts options in sample configMark McLoughlin2012-08-231-7/+12
|/ | | | | | | | | | | | | | Options defined by CommonConfigOpts are declared within the class rather than at module level, so they weren't being included in the sample conf. Also, in essex (and up until commit 991614add8), the sample conf file didn't contain these options but they included the hyphen in the name. The hyphen is only used on the command line, it is converted to an underscore automatically in the config file. Use opt.dest rather than opt.name as the config file key. Fixes bug #1034970. DocImpact: update nova.conf docs Change-Id: Ia7f3dded9148deedeb198c19a8d343db6dd93f99
* Removing double quotes from sample config fileDerek Higgins2012-05-311-3/+3
| | | | | | | | | | Fixes bug #1005869 Changing create_conf.py to no longer include quotes for StrOpt, ListOpt and MultiStrOpt types, Also regenerating and new version of etc/nova/nova.conf.sample Change-Id: I31c0a6cdcfd3e7cacaae6afbf75648ef0a34d668
* Sample config file tool updatesZhongyue Luo2012-05-313-160/+162
| | | | | | | | | | | | | | | Fixes bug #1000133 Current method of extracting config options will not work once the global config object gets removed. 1. Update tool to read a cfg.Opt subclass instance or list of cfg.Opt subclass instances rather than the FLAG object. 2. Word wrap help messages 3. Insert line between consecutive options 4. Print warnings for missing option help string Change-Id: Idd17048b6e8db6e939946968e011e68da8585b8c
* Hack to fixup absolute pybasedir in nova.conf.sampleMark McLoughlin2012-03-091-8/+23
| | | | | | | | | | We want to avoid e.g. /home/markmc or /Users/vishvananda in this file. /usr/lib/python/site-packages is pretty dumb too, but it's suffices as an example. Change-Id: I851841a30ca01790c7b5a9b6bdbd160f4a84467c
* Cleans up the create_conf toolVishvananda Ishaya2012-03-062-16/+28
| | | | | | | | * Makes it adhere to the config file format * Puts the sample output in etc/nova/nova.conf.sample * Updating sample is as easy as ./tools/conf/generate_sample.sh Change-Id: I01e72cb58dd598a74f50c2c17f102d24df325f2e
* Nova options tool enhancementsZhongyue Luo2012-02-241-21/+7
| | | | | | | | | | | | | | | | | Fixes bug #936898 1. Just import the modules and only look at nova.flags.FLAGS when they're all imported 2. ConfigOpts is iterable, there should be no need to iterate the private FLAGS._opts dict 3. Output should be .ini style 4. The output should only contain comments i.e. each option default should be commented out Change-Id: I15835bb437bc6d575e8311d7c55b3a29d67b006d
* nova.conf sample toolZhongyue Luo2012-02-182-0/+171
Fixes bug #918621 A tool to generate a sample nova.conf file Change-Id: I2646d7e674ef3d1759558e820f051cc5e7f3b4ae