diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 24c04dc..decc6e2 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -9,7 +9,7 @@ An example of a configuration file is ``config.yaml``. Some of the parameters available in configuration file: * **ssh_opts** parameters to send to ssh command directly (recommended to leave at default), such as connection timeout, etc. See ``timmy/conf.py`` to review defaults. -* **env_vars** environment variables to pass to the commands and scripts - you can use this to expand variables in commands or scripts +* **env_vars** environment variables to pass to the commands and scripts - you can use these to expand variables in commands or scripts * **fuel_ip** the IP address of the master node in the environment * **fuel_user** username to use for accessing Nailgun API * **fuel_pass** password to access Nailgun API @@ -22,24 +22,24 @@ Some of the parameters available in configuration file: Configuring actions =================== -Actions can be configured in a separate yaml file (by default ``rq.yaml`` is used) and / or defind in the main config file or passed via command line options ``-P``, ``-C``, ``-S``, ``-G``. +Actions can be configured in a separate yaml file (by default ``rq.yaml`` is used) and / or defined in the main config file or passed via command line options ``-P``, ``-C``, ``-S``, ``-G``. The following actions are available for definition: * **put** - a list of tuples / 2-element lists: [source, destination]. Passed to ``scp`` like so ``scp source :destination``. Wildcards supported for source. * **cmds** - a list of dicts: {'command-name':'command-string'}. Example: {'command-1': 'uptime'}. Command string is a bash string. Commands are executed in a sorted order of their names. * **scripts** - a list of elements, each of which can be a string or a dict: - * string - represents a script filename located on a local system. If filename does not contain a path separator, the script is expected ot be located inside ``rqdir/scripts``. Otherwise the provided path is used to access the script. Example: ``'./my-test-script.sh'`` - * dict - use this option if you need to pass variables to your script. Script parameters are not supported, but instead you can use env variables. A dict should only contain one key which is the script filename (read above), and the value is a Bash space-separated variable assignment string. Example: ``'./my-test-script.sh': 'var1=123 var2="HELLO WORLD"'`` - * **LIMITATION**: if you use a script with the same name more than once for a given node, the collected output will only contain the last execution's result. - * **INFO**: Scripts are not copied to the destination system - script code is passed as stdin to `bash -s` executed via ssh or locally. Therefore passing parameters to scripts is not supported (unlike cmds where you can write any Bash string). You can use variables in your scripts instead. Scripts are executed in the following order: all scripts without variables, sorted by their full filename, then all scripts with variables, also sorted by full filename. Therefore if the order matters, it's better to put all scripts into the same folder and name them according to the order in which you want them executed on the same node, and mind that scripts with variables are executed after all scripts without variables. If you need to mix scripts with variables and without and maintain order, just use dict structure for all scripts, and set `null` as the value for those which do not need variables. + * string - represents a script filename located on a local system. If filename does not contain a path separator, the script is expected to be located inside ``rqdir/scripts``. Otherwise the provided path is used to access the script. Example: ``'./my-test-script.sh'`` + * dict - use this option if you need to pass variables to your script. Script parameters are not supported, but you can use env variables instead. A dict should only contain one key which is the script filename (read above), and the value is a Bash space-separated variable assignment string. Example: ``'./my-test-script.sh': 'var1=123 var2="HELLO WORLD"'`` + * **LIMITATION**: if you use a script with the same name more than once for a given node, the collected output will only contain the result of the last execution. + * **INFO**: Scripts are not copied to the destination system - script code is passed as stdin to `bash -s` executed via ssh or locally. Therefore passing parameters to scripts is not supported (unlike cmds where you can write any Bash string). You can use variables in your scripts instead. Scripts are executed in the following order: all scripts without variables, sorted by their full filename, then all scripts with variables, also sorted by full filename. Therefore if the order matters, it's better to put all scripts into the same folder and name them according to the order in which you want them executed on the same node. Mind that scripts with variables are executed after all scripts without variables. If you need to mix scripts with variables and without and maintain order, just use dict structure for all scripts, and set `null` as the value for those which do not need variables. * **files** - a list of filenames to collect. passed to ``scp``. Supports wildcards. -* **filelists** - a list of filelist filenames located on a local system. Filelist is a text file containing files and directories to collect, passed to rsync. Does not support wildcards. If filename does not contain path separator, the filelist is expected to be located inside ``rqdir/filelists``. Otherwise the provided path is used to read the filelist. +* **filelists** - a list of filelist filenames located on a local system. Filelist is a text file containing files and directories to collect, passed to rsync. Does not support wildcards. If the filename does not contain path separator, the filelist is expected to be located inside ``rqdir/filelists``. Otherwise the provided path is used to read the filelist. * **log_files** * **path** - base path to scan for logs * **include** - regexp string to match log files against for inclusion (if not set = include all) * **exclude** - regexp string to match log files against. Excludes matched files from collection. - * **start** - date or datetime string to collect only files modified on or after the specified time. Format - ``YYYY-MM-DD`` or ``YYYY-MM-DD HH:MM:SS`` + * **start** - date or datetime string to collect only files modified on or after the specified time. Format - ``YYYY-MM-DD`` or ``YYYY-MM-DD HH:MM:SS`` or ``N`` where N = integer number of days (meaning last N days). =============== Filtering nodes @@ -55,18 +55,18 @@ Nodes can be filtered by the following parameters defined inside **soft_filter** * **ids** - the list of ids, ex. **[0,5,6]** * any other attribute of Node object which is a simple type (int, float, str, etc.) or a list containing simple types -Lists match **any**, meaning that if any element of the filter list matches node value (if value is a list - any element in it), node passes. +Lists match **any**, meaning that if any element of the filter list matches node value (if value is a list - any element in it), the node passes. -Negative filters are possible by pretending filter parameter with **no_**, example: **no_id = [0]** will filter out Fuel. +Negative filters are possible by prefacing filter parameter with **no_**, example: **no_id = [0]** will filter out Fuel. -Negative lists also match **any** - if any match / collision found, node is skipped. +Negative lists also match **any** - if any match / collision found, the node is skipped. You can combine any number of positive and negative filters as long as their names differ (since this is a dict). You can use both positive and negative parameters to match the same node parameter (though it does not make much sense): **roles = ['controller', 'compute']** **no_roles = ['compute']** -This will skip computes and run only on controllers. Like stated above, does not make much sense :) +This will skip computes and run only on controllers. As already said, does not make much sense :) ============================= Parameter-based configuration @@ -82,7 +82,7 @@ It is possible to define special **by_** dicts in config to (re) In this example for any controller node, cmds setting will be reset to the value above. For nodes without controller role, default (none) values will be used. -It is also possible to define a special **once_by_** which works similarly, but will only result in attributes being assigned to single (first in the list) matching node. Example: +It is also possible to define a special **once_by_** which works similarly, but will only result in attributes being assigned to a single (first in the list) matching node. Example: :: @@ -116,7 +116,7 @@ rqfile format by_roles: compute: [d, e, f] -The **config** and **rqfile** definitions presented above are equivalent. It is possible to define config in a config file using the **config** format, or in an **rqfile** using **rqfile** format, linking to the **rqfile** in config with ``rqfile`` setting. It is also possible to define part here and part there. Mixing identical parameters in both places is not recommended - results may be unpredictable (such scenario was not thoroughly tested). In general **rqfile** is good for fewer settings with more parameter-based variations (``by_``), and main config for more different settings with less such variations. +The **config** and **rqfile** definitions presented above are equivalent. It is possible to define config in a config file using the **config** format, or in an **rqfile** using **rqfile** format, linking to the **rqfile** in config with ``rqfile`` setting. It is also possible to define part here and part there. Mixing identical parameters in both places is not recommended - the results may be unpredictable (such a scenario has not been thoroughly tested). In general, **rqfile** is good for fewer settings with more parameter-based variations (``by_``), and main config for more different settings with less such variations. =============================== Configuration application order @@ -131,6 +131,6 @@ Configuration is assembled and applied in a specific order: 1. first the top-level attributes are set 2. then ``by_`` parameters except ``by_id`` are iterated to override or append(accumulate) the attributes 3. then ``by_id`` is iterated to override any matching attributes, redefining what was set before -5. finally ``once_by_``` parameters are applied - only for one matching node for any set of matching values. This is useful for example if you want a specific file or command from only a single node matching a specific role, like running ``nova list`` only on one controller. +5. finally ``once_by_``` parameters are applied - only for one matching node for any set of matching values. This is useful, for example, if you want a specific file or command from only a single node matching a specific role, like running ``nova list`` only on one controller. Once you are done with the configuration, you might want to familiarize yourself with :doc:`Usage `. diff --git a/doc/source/specification.rst b/doc/source/specification.rst index 939cd5c..5cca5a5 100644 --- a/doc/source/specification.rst +++ b/doc/source/specification.rst @@ -2,15 +2,17 @@ Specification ============= +Mirantis OpenStack Ansible-like tool for parallel node operations: two-way data transfer, log collection, remote command execution + * The tool is based on https://etherpad.openstack.org/p/openstack-diagnostics -* Should work fine on the following environments that were tested: 4.x, 5.x, 6.x, 7.0, 8.0 +* Should work fine in the following environments that have been tested: 4.x, 5.x, 6.x, 7.0, 8.0, 9.0 * Operates non-destructively. -* Can be launched on any host within admin network, provided the fuel node IP is specified and access is possible to Fuel and other nodes via ssh from local system. -* Parallel launch, only on the nodes that are 'online'. Some filters for nodes are also available. +* Can be launched on any host within admin network, provided the fuel node IP is specified and access to Fuel and other nodes is possible via ssh from the local system. +* Parallel launch - only on the nodes that are 'online'. Some filters for nodes are also available. * Commands (from ./cmds directory) are separated according to roles (detected automatically) by the symlinks. Thus, the command list may depend on release, roles and OS. In addition, there can be some commands that run everywhere. There are also commands that are executed only on one node according to its role, using the first node of this type they encounter. * Modular: possible to create a special package that contains only certain required commands. * Collects log files from the nodes using filters * Some archives are created - general.tar.bz2 and logs-* -* Checks are implemented to prevent filesystem filling due to log collection, appropriate error shown. -* Can be imported in other python scripts (ex. https://github.com/f3flight/timmy-customtest) and used as a transport and structure to access node parameters known to Fuel, run commands on nodes, collect outputs, etc. with ease. +* Checks are implemented to prevent filesystem overfilling due to log collection, appropriate error shown. +* Can be imported into other python scripts (ex. https://github.com/f3flight/timmy-customtest) and used as a transport and structure to access node parameters known to Fuel, run commands on nodes, collect outputs, etc. with ease. diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 45e98f0..69f4aec 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -20,17 +20,17 @@ Basic parameters: * ``-v``, ``--verbose`` verbose(INFO) logging * ``-d``, ``--debug`` debug(DEBUG) logging -**Shell Mode** - a mode of exectution which does the following changes: +**Shell Mode** - a mode of execution which makes the following changes: * rqfile (``rq.yaml`` by default) is skipped * Fuel node is skipped * outputs of commands (specified with ``-C`` options) and scripts (specified with ``-S``) are printed on screen * any actions (cmds, scripts, files, filelists, put, **except** logs) and Parameter Based configuration defined in config are ignored. -The following parameters ("actions") are available, using any of them enables **Shell Mode**: +The following parameters ("actions") are available, the usage of any of them enables **Shell Mode**: -* ``-C `` - Bash command (string) to execute on nodes. Using multiple ``-C`` statements will give the same result as using one with several commands separated by ``;`` (traditional Shell syntax), but for each ``-C`` statement a new SSH connection is established -* ``-S