Commit graph

13841 commits

Author SHA1 Message Date
James Cammarata
46beaf8a47 Submodule update 2015-04-14 14:38:56 -05:00
Michael Scherer
8592ffb573 Add back AnsibleFileNotFound ( used in connection plugins ) 2015-04-14 15:23:59 -04:00
Brian Coca
8d871f9650 Merge pull request #7444 from carsongee/cg/nova_inventory_improvements
Improvements to OpenStack inventory script
2015-04-14 14:59:41 -04:00
Brian Coca
09efba2a7c fixed indent when looking at delegate_to vars 2015-04-14 14:41:31 -04:00
James Cammarata
0345b675f8 Rather than moving connection option setting, fix defaults
This reverts the previous commit (d71834d) and instead fixes the problem
by making sure that options used by ConnectionInformation do not have
defaults set in the playbook objects so they're properly inherited from
the CLI options object if not otherwise specified in the play
2015-04-14 12:06:19 -05:00
Brian Coca
d5a7cd0efc bad hack to maybe fix some corner cases with pbrun custom prompts 2015-04-14 12:44:28 -04:00
James Cammarata
d71834d1d2 Moving setting of options values to after play again
Moving this above the play setting means that any default values set
in play (like connection) override any corresponding CLI option, which
is wrong. Generally CLI options should override things set in playbooks
2015-04-14 10:56:10 -05:00
Toshio Kuratomi
ed601f964d Merge pull request #10683 from timsutton/remove-old-git-integration-test
Git integration test: remove test for ambiguous .git/branches dir
2015-04-13 15:14:32 -07:00
Toshio Kuratomi
c14f072a3b Merge pull request #10693 from momandine/import_fixes
Import fixes
2015-04-13 14:39:01 -07:00
Amandine Lee
164cfdfda4 Fix typo 2015-04-13 14:28:00 -07:00
Toshio Kuratomi
c486b6773a Merge pull request #10692 from ianzd/python3
Import queue from six.moves for python3 compatibility.
2015-04-13 14:26:40 -07:00
Amandine Lee
08feaea077 Fix plugin imports with six 2015-04-13 14:04:31 -07:00
Ian Dotson
6e12117b04 Import queue from six.moves for python3 compatibility. 2015-04-13 17:01:00 -04:00
Toshio Kuratomi
4b889bbe3d Add six to the v2 test-requirements 2015-04-13 13:43:25 -07:00
Toshio Kuratomi
056f646bda Merge pull request #10681 from dorianpula/test_requirements_for_v2
Add test requirements for working with v2.
2015-04-13 13:42:23 -07:00
Amandine Lee
bd4c30b807 Merge remote-tracking branch 'upstream/devel' into devel 2015-04-13 13:40:44 -07:00
Toshio Kuratomi
7133d6361f Merge pull request #10691 from ianzd/python3
Change how we're calling StringIO
2015-04-13 13:36:22 -07:00
Toshio Kuratomi
5dce745868 Merge pull request #10690 from momandine/print_function
Print function
2015-04-13 13:35:04 -07:00
Ian Dotson
d85f97ccfd Change how we're calling StringIO since we're now importing the class rather than a module. 2015-04-13 16:31:16 -04:00
Amandine Lee
683c2913c5 Use print function 2015-04-13 13:28:27 -07:00
Amandine Lee
3d2a056ad4 Import futures including print 2015-04-13 13:28:01 -07:00
Toshio Kuratomi
b0479c425b Merge pull request #10688 from ianzd/devel
Import StringIO from six in a couple more places.
2015-04-13 13:05:36 -07:00
ian
3bb7b0eef3 Import StringIO from six in a couple more places. 2015-04-13 16:03:02 -04:00
Toshio Kuratomi
3a8088fe30 _available_vars in v1 == _available_variables in v2 2015-04-13 12:58:21 -07:00
Toshio Kuratomi
4bbca9211a Merge pull request #10687 from ianzd/devel
Several more changes to support python3 syntax.
2015-04-13 12:42:57 -07:00
Brian Coca
483c8d338f Merge pull request #10684 from eroldan/patch-1
Fixed wrong example of 'environment' for setting PATH
2015-04-13 15:38:52 -04:00
ian
1bdf0bb0d6 Several more changes to suport python3 syntax. 2015-04-13 15:37:25 -04:00
eroldan
87dde862bd Fixed wrong example of 'environment' for setting PATH 2015-04-13 16:21:08 -03:00
Dorian Pula
3504f1cad9 Add test requirements for working with v2. 2015-04-13 13:44:58 -04:00
Timothy Sutton
5f1ba589a5 Git integration test: remove test for ambiguous .git/branches dir
- '.git/branches' does not always exist, but the git integration
  tests always checks for this directory's existence so it always
  fails
- more info:
  - http://stackoverflow.com/questions/10398225/what-is-the-git-branches-folder-used-for
2015-04-13 13:38:11 -04:00
Toshio Kuratomi
bad554d517 Merge pull request #9268 from kustodian/docs_advance_conditions
Added an example for paretheses
2015-04-13 10:13:41 -07:00
Toshio Kuratomi
a444a7f363 Merge pull request #10680 from ianzd/devel
Change exceptions to python3 syntax.
2015-04-13 09:43:02 -07:00
Toshio Kuratomi
5f03638d2c Merge pull request #10679 from dorianpula/setup_py_for_v2
Add setup.py for v2 to allow for pip editable installs.
2015-04-13 09:35:56 -07:00
Dorian Pula
b407dd8b58 Add setup.py for v2 to allow for pip editable installs. 2015-04-13 13:34:48 -04:00
ian
6747f82547 Change exceptions to python3 syntax. 2015-04-13 12:35:20 -04:00
Toshio Kuratomi
557cd15c25 Merge pull request #10677 from dorianpula/fix_re_import_test_failure
Fix re import failure in templates module when running unit tests.
2015-04-13 09:23:06 -07:00
Dorian Pula
b193d327b6 Fix re import failure in templates module when running unit tests. 2015-04-13 12:17:07 -04:00
Toshio Kuratomi
1121928f50 Merge pull request #10318 from dmahler/devel
Some grammatical updates
2015-04-13 08:43:31 -07:00
Brian Coca
62c08d96e5 fixed another typo 2015-04-13 10:58:17 -04:00
Brian Coca
89cc54cc16 typo fix 2015-04-13 10:50:24 -04:00
Brian Coca
b509de6c84 Merge pull request #10643 from bcoca/aix_facts_fix
fix for when calling bootinfo throws permmission errors (AIX)
2015-04-13 10:22:38 -04:00
Brian Coca
67512aeeb6 Merge pull request #10618 from jder/force-handlers
Fix --force-handlers, and allow it in plays and ansible.cfg
2015-04-13 10:16:45 -04:00
Brian Coca
224fd0adfe added fleetctl entry for new inventory script to changelog 2015-04-13 10:10:32 -04:00
Brian Coca
af960fe8d5 Merge pull request #9624 from andrewrothstein/devel
an ansible inventory garnered from fleetctl
2015-04-13 10:06:27 -04:00
Brian Coca
080b395d9f Merge pull request #10676 from radarhere/patch-1
Fixed changelog typos
2015-04-13 09:49:33 -04:00
Andrew Murray
e6b7b9206d Fixed changelog typos 2015-04-13 23:45:09 +10:00
Toshio Kuratomi
de52cfb5d7 Merge pull request #10465 from feanil/feanil/fix_templates_for_ints_bools
Don't convert numbers and booleans to strings.
2015-04-11 09:08:24 -07:00
Feanil Patel
0abcebf1e4 Don't convert numbers and booleans to strings.
Before this change if a variable was of type int or bool and the variable was referenced
by another variable, the type would change to string.

eg. defaults/main.yml
```
PORT: 4567
OTHER_CONFIG:
  secret1: "so_secret"
  secret2: "even_more_secret"

CONFIG:
  hostname: "some_hostname"
  port: "{{ PORT }}"
  secrets: "{{ OTHER_CONFIG }}"
```

If you output `CONFIG` to json or yaml, the port would get represented in the output as a
string instead of as a number, but secrets would get represented as a dictionary.  This is
a mis-match in behaviour where some "types" are retained and others are not.  This change
should fix the issue.

Update template test to also test var retainment.

Make the template changes in v2.
Update to only short-circuit for booleans and numbers.

Added an entry to the changelog.
2015-04-11 12:03:42 -04:00
Chris Church
a6084f9fd8 Merge pull request #9222 from cchurch/win_user_tests
Tests for win_user module
2015-04-11 02:11:32 -04:00
Chris Church
42bd640d14 Update win_user tests to set a group on user creation. 2015-04-11 01:55:56 -04:00