The way the parser merges the CLI configuration with the file configuration is.
For each option:
1. If a value was passed to the CLI, that value rules.
2. If not value was passed to the CLI and no value is defined in the config file. The default, it any, is used.
3. If a value is not passed to the CLI and the value is defined in the config file, the config file one will be used.
Some code was using the parser options for logic and values after the configuration loaded, but the parser options were never updated to the configuration files values.
So:
4. Do what we said in the above 3, **and**, update the parser option to have that value.
Passing these through yaml.safe_load() will result in the pound sign and
everything after it being interpreted as a comment. This commit stops
the argument from being passed through yaml.safe_load if it is a string
and contains a pound sign.
When status.pid is executed by the salt-minion instance running on the
master, it also returns the pid of the salt CLI command, because the
search string matches. This commit adds another grep to the ps/grep/awk
one-liner, which filters out lines matching 'status.pid'.
I have modified the core grains detection routines where dragons often lay, so this should be reviewed carefully.
I have elected to set the LXC detection inside virtual_subtype for account for cases wherein a user might be running inside VirtualBox (as the tutorial for Docker leads one to do). Moreover, I also allow the virtualization detection to continue after LXC is detected, as I believe it may even be possibly for Xen and LXC to co-exist. (Though, let's be honest -- probably not recommended!)
Finally, disk.usage now correctly fails with a warning message and includes a work-around for gathering disk usage under Docker containers. This refs #8976.
Oracle Linux 5, also known as Unbreakable Linux is currently
not supported by salt.
This one line fix solves this issue.
For reference, the os info extracted through platform.linux_distribution()
python call:
('Enterprise Linux Enterprise Linux Server', '5.1', 'Carthage')
