Commit graph

3745 commits

Author SHA1 Message Date
Brian Coca
a1e2ae083d Merge pull request #10320 from bcoca/ssh_fix_notokens
skips certain ssh errors and attempts to continue
2015-02-25 10:34:04 -05:00
Brian Coca
9ad8475be9 Merge pull request #9605 from msabramo/more_ssh_error_info
Display more info when SSH errors occur
2015-02-25 09:27:49 -05:00
Brian Coca
4fa51652b4 fixed typoe in combined_Vars 2015-02-24 05:26:41 -05:00
Brian Coca
ce764063f1 corrected merge vs combined in all pertinent sections 2015-02-24 05:14:22 -05:00
Brian Coca
e59b364641 changed from hash_merge to combine vars which resets default to
overwrite and not merge hashing
2015-02-24 05:05:27 -05:00
Matt Stephenson
a2ea785d69 Add function to ipaddr for getting the nth host within a network 2015-02-23 13:42:03 -08:00
Matt Stephenson
ce17f5e1ec Fix indentation 2015-02-23 12:51:19 -08:00
Brian Coca
65e68cdff9 Merge pull request #10316 from whereismyjetpack/winrm_https
plaintext https transport connecting over http
2015-02-23 11:00:33 -05:00
Toshio Kuratomi
a6fbd83660 * Transform vars_prompt result to unicode type before returning (Fixes #10319)
* Rename prompt method as do_prompt to avoid potential bug when logging via a callback plugin
2015-02-23 07:59:20 -08:00
Toshio Kuratomi
920b71984e lists => frozenset as we're only using them in membership checks 2015-02-23 07:09:33 -08:00
Brian Coca
b9aa8f07be skips certain ssh errors and attempts to continue
should fix #10225
2015-02-23 05:17:41 -05:00
Dann Bohn
5da5fa15c6 rm duplicate 2015-02-22 02:29:10 -05:00
Dann Bohn
b9bfb22a9d fix https transport bug 2015-02-21 17:43:59 -05:00
Alvaro Lopez Ortega
2e929cf0ce Fixes bug #10281 - Trailing zeros were truncated from strings 2015-02-21 19:54:38 +01:00
Alvaro Lopez Ortega
a14248ffe1 Fixes bug #10281 - Trailing zeros were truncated from strings 2015-02-21 16:40:50 +01:00
Brian Coca
6b64fe8bdd Merge pull request #9936 from sysadmin75/9415_hostname_as_dir
Fixes #9415 - fetch: should use hostname instead of ip for directory name
2015-02-20 11:14:48 -05:00
Brian Coca
acbd096cf3 Merge pull request #10298 from bcoca/lookup_wantlist
Allow requesting a list to lookup plugins instead of , delimited string
2015-02-20 10:16:57 -05:00
Brian Coca
5d946ec4f2 adds cartesian product lookup 2015-02-20 09:04:00 -05:00
Brian Coca
1d90ff8b34 Merge pull request #10304 from dago/ldom
Add LDom support
2015-02-20 08:09:58 -05:00
Dagobert Michelsen
c1dba60961 Use try block for field splitting 2015-02-20 13:57:02 +01:00
Dagobert Michelsen
90e760ba84 Add LDom support 2015-02-20 10:11:06 +01:00
Brian Coca
57674fa047 Allow requesting a list to lookup plugins instead of , delimited string 2015-02-19 18:29:29 -05:00
Brian Coca
e842f8fab9 Merge pull request #10295 from bcoca/show_return_val_docs
ansible-doc now shows return value docs
2015-02-19 18:00:06 -05:00
Brian Coca
c587bf1488 fixed absolute_import to be on top as it requries 2015-02-19 16:45:34 -05:00
Brian Coca
c2023f6f59 Merge pull request #10285 from bcoca/math_filter_rearrange
rearranged math filters
2015-02-19 16:04:26 -05:00
Brian Coca
1e818f9c50 ansible-doc now shows return value docs 2015-02-19 13:18:05 -05:00
Brian Coca
8be8a7e2f5 Merge pull request #10277 from dago/solaris
Add Solaris zone support for inventory and connection

NOTE: the connection plugin will need some work for v2 (after 1.9 gets released)
2015-02-19 13:13:31 -05:00
Brian Coca
414737557e Merge pull request #10284 from mihirvj/devel-10221
Pulls machine id in ansible facts
2015-02-19 12:56:45 -05:00
Brian Coca
e6ac2fa593 Merge pull request #10292 from dago/solaris-mounts
Add support for mounts in Solaris facts
2015-02-19 12:46:37 -05:00
Dagobert Michelsen
b82a8576f1 Add support for mounts in Solaris facts 2015-02-19 15:38:20 +01:00
Brian Coca
7044b5a8d1 removed bare variable detection as this confuses people and forced us to allow for bare expressions 2015-02-19 08:29:53 -05:00
Brian Coca
c92c4e7376 readded absolute_import 2015-02-19 07:39:45 -05:00
Brian Coca
8872bba21f rearranged math filters 2015-02-18 20:03:05 -05:00
Mihir Joshi
58a5f8dfaf Pulls machine id in ansible facts
- Fix #10221
2015-02-18 17:10:36 -05:00
Dagobert Michelsen
81f55ff8ff Adjust leftovers from chroot 2015-02-18 16:52:44 +01:00
jensdepuydt
730c2ba403 minor change to not search in non-existing paths 2015-02-18 12:07:35 +01:00
jensdepuydt
adc0e8be97 Merge branch 'optimize-plugin-loader-10165' of github.com:ansible/ansible into optimize-plugin-loader-10165 2015-02-18 12:04:54 +01:00
Toshio Kuratomi
68e86de26f Optimize the plugin loader.
We have been caching the paths to the plugins but before we would only
cache the specific plugin that we were looking for.  This meant that we
might search through all of the plugin directories before finding the
specific module we were interested in.  The next plugin we needed we
might again search through all the plugin directories before finding the
plugin we wanted.

This new code will cache all the potential plugins in each directory
searched.  For a play that only uses one plugin we'll only search
through directories until we encounter the directory that has the proper
plugin.  For a large playbook with many plugins used we'll search
through each directory at most once each.

This should alleviate #10165
2015-02-17 13:24:46 -08:00
Dan Rue
67eb9f301d Do not mark "skipped" when changed is false
When using the "creates" option with the script module, set changed
to False if the file already exists. This behavior is consistent with
other modules which use "creates", such as command and shell.
2015-02-17 15:14:21 -06:00
Dan Rue
787388ac30 Do not mark "skipped" when changed is false
When using the "creates" option with the unarchive module, set changed
to False if the file already exists. This behavior is consistent with
other modules which use "creates", such as command and shell.
2015-02-17 15:02:08 -06:00
Toshio Kuratomi
5738ee1cb3 Update core modules to fix new integration tests 2015-02-16 22:08:53 -08:00
Brian Coca
6f6c6fb32a Merge pull request #10259 from sivel/rax-boot-vol-v2
Add new rax_find_bootable_volume to assist with boot from volume
2015-02-16 18:04:16 -05:00
Toshio Kuratomi
8f9b761f3a Merge pull request #10128 from alxgu/fix_facts_for_sles
Fix wrong distribution facts on SLES/openSUSE
2015-02-16 13:24:12 -08:00
Stratos Moros
6caeded74e Fix umask calculation on file creation. Fixes #10257 2015-02-16 21:16:26 +02:00
Brian Coca
6a29251292 Merge pull request #10248 from hfinucane/gh-9888
Add `groups` back into inline templates
2015-02-16 13:56:20 -05:00
Brian Coca
e41d48104f valutpass fix in password reorog 2015-02-16 12:24:43 -05:00
Brian Coca
b2d5919d6d Merge pull request #10250 from cove/cyaml
improve yaml parsing performance by ~25% by using PyYAML's CParser loader
2015-02-16 12:11:58 -05:00
Brian Coca
a022aed43d Merge pull request #10229 from bcoca/patch_not_require_dest
patch action plugin does not require dest
2015-02-16 11:18:27 -05:00
Toshio Kuratomi
d0556885ff Update modules 2015-02-16 07:14:11 -08:00
Toshio Kuratomi
c9fb97cc86 Be careful not to set the permissions of the destination of a symlink.
It's up to the module using the set_fs_attributes*/set_mode* methods to
specify the filename of the destination of the symlink if that's really
the file that should be modified.

Half of the fix for:
https://github.com/ansible/ansible-modules-core/issues/778
2015-02-16 07:07:58 -08:00
Alexander Gubin
d291dae582 Exit loop after detecting os-release 2015-02-16 13:18:11 +01:00
Cove Schneider
825654a2fa parse yaml using cparser if present 2015-02-16 00:26:35 -08:00
Henry Finucane
2e4191c013 Add groups back into inline templates 2015-02-15 20:16:41 -08:00
Toshio Kuratomi
1e867b0b8e Fix the to_nice_yaml filter to always return unicode strings
Fixes #10243
2015-02-14 22:25:56 -08:00
Matt Martz
cfd05ceafc Add new rax_find_bootable_volume to assist with boot from volume 2015-02-13 15:25:42 -06:00
Brian Coca
f6a6df2169 removed unused method 2015-02-13 08:27:35 -05:00
Brian Coca
65c08d1364 added tests
refactored task selection into method
list-tasks now uses common method of task selection
always is now skippable if specified in --skip-tags
2015-02-13 08:27:07 -05:00
Brian Coca
6fbbf9c118 simplified if conditions 2015-02-13 08:27:07 -05:00
Brian Coca
6579c5ddf5 fixed skipped tags 2015-02-13 08:27:07 -05:00
Brian Coca
95fa770ba0 adds complex tag management
Adds a special tag:
 - always: always runs no matter what --tags, --skip-tags say

Adds 4 special keywords for --tags/skip-tags
 - all: all tagged + untagged tasks
 - tagged: only tagged tasks
 - untagged: only untagged tasks
 - always: only run tasks tagged 'always'
2015-02-13 08:27:07 -05:00
Brian Coca
f61de115cd updated version added for pkg5* 2015-02-13 08:21:50 -05:00
Brian Coca
64690691d3 updated to pickup fixed cpanm 2015-02-13 08:10:26 -05:00
Brian Coca
932fd2eda2 fixed vault pass also 2015-02-12 19:03:50 -05:00
Brian Coca
0087816b13 fixed varname su_pass 2015-02-12 19:03:04 -05:00
Brian Coca
69b76a48b0 dest is not required as patchfile can have that info 2015-02-12 18:52:58 -05:00
Brian Coca
5f2d5abeea ensure proper strings/unicodestrings for passwords
updated to correct to_bytes function
removed old to_bytes/to_unicode and repointed clients to new location
fixed unicode test
2015-02-12 17:44:08 -05:00
Toshio Kuratomi
9d605171a7 Didn't port isbasestring/isunicodestring from kitchen so switch to isinstance 2015-02-12 13:55:27 -08:00
Toshio Kuratomi
740bd8fbde Update to fix logentries issues 2015-02-12 12:58:36 -08:00
Toshio Kuratomi
dd484e8211 Update modules 2015-02-12 12:16:31 -08:00
Brian Coca
62a6378c4a Merge pull request #8792 from bcoca/ternary_filter
ternary filter
2015-02-12 11:29:49 -05:00
Brian Coca
0912781357 Merge pull request #9421 from emonty/features/new-openstack
Add support for new OpenStack modules
2015-02-12 10:26:12 -05:00
Brian Coca
1b4f1e1756 Merge pull request #9555 from bcoca/low_cost_facts
allow fact objects to be instantiated w/o triggering all fact collection
2015-02-11 20:57:40 -05:00
Brian Coca
fd987f5395 Merge pull request #9063 from sivel/extra-vars-adhoc
Allow ansible (ad-hoc) to support --extra-vars
2015-02-11 20:46:37 -05:00
Matt Martz
68358e31fb Allow ansible (ad-hoc) to support --extra-vars also 2015-02-11 19:34:01 -06:00
Toshio Kuratomi
6fe8865885 Return empty string if unable to read from some files during fact gathering so as not to change the values we return 2015-02-11 14:53:53 -08:00
Brian Coca
13d788021f Merge pull request #4820 from mscherer/add_local_config
Add path for user defined plugin
2015-02-11 14:44:07 -05:00
Monty Taylor
9b17918bc9 Add doc fragment for new OpenStack modules 2015-02-11 14:04:59 -05:00
Monty Taylor
8c7267f9b9 Add support for new OpenStack modules
Incoming cloud config for OpenStack is complex due to plugins and
deployer choices. Rather than having the logic spread all over the
OpenStack modules, centralize it in the module_utils code.
2015-02-11 14:04:27 -05:00
Brian Coca
788889225d Merge pull request #10078 from sgargan/consul
Ansible support for Consul
2015-02-11 13:58:15 -05:00
Brian Coca
0b8101aec3 Merge pull request #10141 from dresden-weekly/fix_#10051
fixes #10051 as suggested by @aikomastboom
2015-02-11 13:57:04 -05:00
Brian Coca
c966eb5d80 Merge pull request #10015 from bcoca/nicer_json_errors
handle json load errors as ansible error instead of ugly stacktrace
2015-02-11 13:31:25 -05:00
Dagobert Michelsen
9cf8c3a901 Add support for Solaris zones 2015-02-11 16:48:04 +01:00
Nicolas Le Manchet
faa2449f55 Set proper permissions for ansible-vault view 2015-02-11 14:15:38 +01:00
Toshio Kuratomi
10df1b898c Fix template module broken when modifying symlinks
Needed to clear unwanted parameters from both args and complex args when
calling file module.

Fixes #10208
2015-02-11 00:10:37 -08:00
Kirk Strauser
ab33a0e666 Adds Kerberos authentication to winrm if available
If the `kerberos` module is available, winrm will attempt to establish a
Kerberized connection to a Windows server. This allows use of Windows
domain accounts, which are quite often the only kinds of accounts
enabled on enterprise networks.

This also pulls the `transport_schemes` variable up into the
`winrm.Connection` class. This lets tests or future modifications alter
the list of available schemas without reaching into `Connection.__init__`.
2015-02-10 07:39:07 -08:00
Brian Coca
416a4c3342 Merge pull request #10199 from bcoca/su_ssh_fix
fixes su/ssh with null prompt
2015-02-10 09:49:35 -05:00
Brian Coca
f7ad6ad4de fixed issue with prompt == none and su + ask_pass in ssh plugin 2015-02-10 08:47:11 -05:00
Henk Wiedig
0a902a5afd make su promt AIX compatible
$ su suuser date
suusers's Password:
2015-02-10 05:18:37 -05:00
Brian Coca
75d3c6b104 Merge pull request #10185 from bcoca/valut_editor_missing_err
better missing editor message
2015-02-09 18:16:57 -05:00
Brian Coca
2f2fe734df Merge pull request #10192 from bcoca/patch_action_plugin
support for patch module to have master as src
2015-02-09 18:08:34 -05:00
Toshio Kuratomi
402a6d0533 Explicitly close files opened by facts
Fixes #10157
2015-02-09 14:30:06 -08:00
Brian Coca
476b0f6d99 support for patch module to have master as src 2015-02-09 16:34:49 -05:00
Toshio Kuratomi
425dee1afa Close some file handles explicitly in facts.py
Helps control open file descriptor count with pypy (which is used with
one coreos + ansible example).  Part of a fix for
https://github.com/ansible/ansible/issues/10157
2015-02-09 13:06:33 -08:00
Toshio Kuratomi
9db17afc85 Update modules 2015-02-09 11:00:57 -08:00
Toshio Kuratomi
4902c06304 Obfuscate passwords in more places where it is displayed 2015-02-09 10:13:13 -08:00
Brian Coca
8b7dc6bbfb better missing editor message
fixes #10182
2015-02-08 23:26:56 -05:00
Toshio Kuratomi
3f97fc2ba6 Merge pull request #10162 from jonhadfield/fix_2.4_hashing
correct typo that breaks hashing on python 2.4.
2015-02-04 09:44:40 -08:00
Brian Coca
07dfbaedc3 Merge pull request #9602 from cchurch/powershell_splatting
Handle PowerShell parameters passed via splatting
2015-02-04 10:25:03 -05:00
Jon Hadfield
6874f5056d correct typo that breaks hashing on python 2.4. 2015-02-04 13:46:49 +00:00
Alexander Gubin
1968f99691 Wrong OS_FAMILY declaration for openSUSE 2015-02-04 09:16:32 +01:00
Toshio Kuratomi
019f74dced Update modules 2015-02-03 09:02:46 -08:00
Brian Coca
1b8d0b68a8 Merge pull request #10158 from bcoca/hosts_better_error
more resilient errors for bad host declarations in play
2015-02-03 10:33:47 -05:00
Brian Coca
cbbe2f4e26 more resilient errors for bad host declarations in play
should fix #10148
2015-02-03 10:26:48 -05:00
Brian Coca
7ea2aff272 Merge pull request #9772 from jszwedko/allow-template-for-retries
Allow retries to be templatable
2015-02-03 07:08:22 -05:00
Toshio Kuratomi
788e47b693 Correct filter specification 2015-02-02 19:21:26 -08:00
Toshio Kuratomi
8fd7f4b121 Wrap some filters so they return unicode.
The rules are -- if the filter returns str type and the str may contain
non-ascii characters then wrap it to convert to unicode type.  Not
needed if the function already returns unicode type or only returns
ascii characters
2015-02-02 19:11:12 -08:00
Toshio Kuratomi
a04138a887 Add v2's unicode.py to utils so we can use unicode_wrap in the filter_plugins 2015-02-02 19:09:08 -08:00
Toshio Kuratomi
6d788629a2 Be explicit about unicode str transformation
Fixes #10126
2015-02-02 13:37:31 -08:00
Toshio Kuratomi
97438f0039 Update the modules 2015-02-02 10:25:59 -08:00
Toshio Kuratomi
0e5f86cce4 Import hash functions for filters from the new location so the plugins will work on v1 and v2 2015-02-02 10:25:09 -08:00
Toshio Kuratomi
1011959d88 Move the hashing util functions to their own file to mirror v2 2015-02-02 10:25:09 -08:00
Toshio Kuratomi
b3af2f9bee Better error message 2015-02-02 08:52:19 -08:00
Toshio Kuratomi
f6e8ddfd5f Use pass instead of bare None value 2015-02-02 08:52:19 -08:00
Toshio Kuratomi
624a8dd1d9 Replace large if-elif-else blocks with a dict-dispatcher 2015-02-02 08:52:19 -08:00
Toshio Kuratomi
616fda5767 First try at only failing if the filter is actually used. 2015-02-02 08:52:19 -08:00
Maciej Delmanowski
7e46554160 Add ipaddr() filter plugin 2015-02-02 08:52:19 -08:00
Brian Coca
17666a1939 changed default for new retry path to be teh same as current
also added commented out entries in ansible.cfg to show other options
2015-01-30 15:18:58 -05:00
Brian Coca
540d13cf52 Merge pull request #9404 from mmoya/configure-retry-files
Configure retry file usage and location
2015-01-30 15:14:27 -05:00
Andreas Reischuck
6609f3ac03 fix suggested by @aikomastboom 2015-01-30 21:04:52 +01:00
Toshio Kuratomi
ca35d138f1 Update modules 2015-01-30 07:46:36 -08:00
Toshio Kuratomi
f355c11a3f Merge pull request #10129 from RadishTheHut/memfacts-fix
Fix for memory fact gathering
2015-01-30 07:44:58 -08:00
Brian Coca
7ab95e10f0 updated to latest core devel 2015-01-30 08:29:58 -05:00
Patrick McConnell
04b2c698ba Updated memory facts fix using dict.get() to avoid KeyError 2015-01-30 05:59:34 +01:00
Toshio Kuratomi
747cc26ae1 Update modules 2015-01-29 18:31:15 -08:00
Toshio Kuratomi
f20967078e Fixes to @RadishTheHut's memory facts as discussed in
https://github.com/ansible/ansible/pull/10129#issuecomment-72077500

* Switch default value from 0 to None.
* Prefill keys with default value so that determining calculated values
  is easier
2015-01-29 12:09:19 -08:00
Marc Abramowitz
372a29744b Make AnsibleError a plain ol' exception
Python's Exception constructor already takes a `message` as a parameter,
which you can then get at by doing str(e) (e.message was deprecated).

The reason I bothered to make this change was because I was debugging
with pdb and I noticed that AnsibleErrors don't give useful information
in pdb (probably because they don't have a __repr__ method that prints
the `msg` attribute).

    (Pdb) c
    > /Users/marca/dev/git-repos/ansible/lib/ansible/runner/__init__.py(599)_executor()
    -> msg = str(ae)
    (Pdb) ae
    AnsibleError()
2015-01-29 10:36:06 -08:00
Brian Coca
c73254543a made env var also consistent 2015-01-29 13:32:00 -05:00
Brian Coca
4fd760467b made inventory consistent in config file, deprecated old config hostfile 2015-01-29 13:28:33 -05:00
Brian Coca
751701c6f2 Merge pull request #9672 from quinot/topic/lineno-in-inventory-err
Report location (filename and line number) for inventory syntax errors
2015-01-29 12:36:30 -05:00
Brian Coca
e4a7b973fd Merge pull request #9128 from msabramo/expose_more_user_facts
Expose more facts about user on host system
2015-01-29 09:55:30 -05:00
Patrick McConnell
0c3a273805 Fix for memory fact gathering
I have a host which started to fail while gathering facts after the addition
of expanded memory facts in PR #9839:

Traceback (most recent call last):
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 4278, in <module>
    main()
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 137, in main
    data = run_setup(module)
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 81, in run_setup
    facts = ansible_facts(module)
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 4217, in ansible_facts
    facts.update(Hardware().populate())
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 2339, in populate
    self.get_memory_facts()
  File "/home/ansible/.ansible/tmp/ansible-tmp-1422536976.05-133253824703289/setup", line 2375, in get_memory_facts
    'cached': memstats['swapcached']
KeyError: 'swapcached'

My problem host doesn't have SwapCached in /proc/meminfo. It may be better to
set defaults for these keys, since the values provided by /proc/meminfo can
change from version to version.
2015-01-29 15:00:01 +01:00
Alexander Gubin
5dec45e24a Fix wrong distribution facts on SLES/openSUSE 2015-01-29 14:54:53 +01:00
Toshio Kuratomi
556d4f0025 Update core modules 2015-01-28 16:31:08 -08:00
Toshio Kuratomi
44fe38030f Update core modules for subversion fixes 2015-01-28 16:17:30 -08:00
Toshio Kuratomi
3d5523fbb7 Fix for unicode filenames for template module
Fixes #10110
2015-01-28 14:24:57 -08:00
Toshio Kuratomi
0aac6360e4 Update core modules 2015-01-28 10:38:36 -08:00
Brian Coca
990d08b63f Merge pull request #10113 from bcoca/url_lookup
Url lookup
2015-01-28 09:54:40 -05:00
Brian Coca
11005e7b28 Merge pull request #9839 from nousdefions/memfacts
Memfacts
2015-01-28 09:39:24 -05:00
Brian Coca
3d6b6edea9 added url lookup plugin 2015-01-27 17:26:18 -05:00
Toshio Kuratomi
35321ec642 ansible.utils to_unicode/to_bytes isn't robust in the face of
non-strings.  Do some value checking in the calling code
2015-01-27 14:18:06 -08:00
Toshio Kuratomi
975b547aaa Update core modules 2015-01-27 09:47:20 -08:00
Toshio Kuratomi
a63e4c595f Another place that needs to be json_dict_bytes_to_unicode 2015-01-26 22:04:51 -08:00
Toshio Kuratomi
0f6b87d33e Revert "Fix import statements" -- those impotrt statements were right
before... something else is fishy

This reverts commit 8ab536fbf2.
2015-01-26 22:01:52 -08:00
Toshio Kuratomi
8ab536fbf2 Fix import statements 2015-01-26 21:49:09 -08:00
Toshio Kuratomi
d3666f3265 Make py2.4 remote checksum large-file-enabled as well 2015-01-26 21:44:42 -08:00
Toshio Kuratomi
6f5d18a20e Merge pull request #10087 from axos88/devel
fix checksum calculation for large files
2015-01-26 21:40:09 -08:00
Toshio Kuratomi
335cf2f05f Update module repos 2015-01-26 20:39:53 -08:00
Toshio Kuratomi
915d232d5f jinja2 cannot handle byte strs with non-ascii. So we need to transform potential byte str into unicode type. This fix is for dynamic inventory.
Fixes #10007
2015-01-26 20:39:09 -08:00
Brian Coca
9d190c8d8d Revert "Support variable values with dashes" 2015-01-26 12:54:50 -05:00
Brian Coca
13bbf9bfbb Merge pull request #9834 from nathancahill/fix-variables-with-dashes
Support variable values with dashes
2015-01-26 12:51:56 -05:00