Merge new ansible 2.0 config into ours, switch to vmdiff v2 script for vmdiff.

roles/ansible-server/templates/ansible.cfg.j2

@@ -13,30 +13,45 @@
 
 hostfile       = {{ ansible_base }}/ansible/inventory
 library        = {{ ansible_base }}/ansible/library:/usr/share/ansible
-remote_tmp     = $HOME/.ansible/tmp
+#remote_tmp     = $HOME/.ansible/tmp
 pattern        = *
 forks          = 90
 poll_interval  = 15
-sudo_user      = root
+#sudo_user      = root
 #ask_sudo_pass = True
 #ask_pass      = True
-transport      = smart
-remote_port    = 22
+#transport      = smart
+#remote_port    = 22
+#module_lang    = C
 
-# additional paths to search for roles in, colon seperated
+# plays will gather facts by default, which contain information about
+# the remote system.
+#
+# smart - gather by default, but don't regather if already gathered
+# implicit - gather by default, turn off with gather_facts: False
+# explicit - do not gather by default, must say gather_facts: True
+#gathering = implicit
+
+# additional paths to search for roles in, colon separated
 roles_path    = {{ ansible_base }}/ansible/roles
 
 # uncomment this to disable SSH key host checking
 #host_key_checking = False
 
-# change this for alternative sudo implementations
-sudo_exe = sudo
+# change the default callback
+#stdout_callback = skippy
+# enable additional callbacks
+callback_whitelist = fedmsg_callback2,profile_tasks,logdetail2
 
-# what flags to pass to sudo
-#sudo_flags = -H
+# change this for alternative sudo implementations
+#sudo_exe = sudo
+
+# What flags to pass to sudo
+# WARNING: leaving out the defaults might create unexpected behaviours
+#sudo_flags = -H -S -n
 
 # SSH timeout
-timeout = 90
+#timeout = 10
 
 # default user to use for playbooks if user is not specified
 # (/usr/bin/ansible will use current user as default)
@@ -59,10 +74,10 @@ timeout = 90
 # this can also be set to 'merge'.
 #hash_behaviour = replace
 
-# How to handle variable replacement - as of 1.2, Jinja2 variable syntax is
-# preferred, but we still support the old $variable replacement too.
-# Turn off ${old_style} variables here if you like.
-#legacy_playbook_variables = yes
+# by default, variables from roles will be visible in the global variable
+# scope. To prevent this, the following option can be enabled, and only
+# tasks and handlers within the role will see the variables there
+#private_role_vars = yes
 
 # list any Jinja2 extensions to enable here:
 #jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n
@@ -71,10 +86,12 @@ timeout = 90
 # if passing --private-key to ansible or ansible-playbook
 #private_key_file = /path/to/file
 
-# format of string {{ ansible_managed }} available within Jinja2 
+# format of string {{ ansible_managed }} available within Jinja2
 # templates indicates to users editing templates files will be replaced.
 # replacing {file}, {host} and {uid} and strftime codes with proper values.
 ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
+# This short version is better used in templates as it won't flag the file as changed every run.
+#ansible_managed = Ansible managed: {file} on {host}
 
 # by default, ansible-playbook will display "Skipping [host]" if it determines a task
 # should not be run on a host.  Set this to "False" if you don't want to see these "Skipping" 
@@ -91,7 +108,20 @@ ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid}
 # system running ansible itself. This may include warnings about 3rd party packages or
 # other conditions that should be resolved if possible.
 # to disable these warnings, set the following value to False:
-system_warnings = False
+#system_warnings = True
+
+# by default (as of 1.4), Ansible may display deprecation warnings for language
+# features that should no longer be used and will be removed in future versions.
+# to disable these warnings, set the following value to False:
+#deprecation_warnings = True
+
+# (as of 1.8), Ansible can optionally warn when usage of the shell and
+# command module appear to be simplified by using a default Ansible module
+# instead.  These warnings can be silenced by adjusting the following
+# setting or adding warn=yes or warn=no to the end of the command line 
+# parameter string.  This will for example suggest using the git module
+# instead of shelling out to the git command.
+# command_warnings = False
 
 # set plugin path directories here, seperate with colons
 action_plugins     = {{ ansible_base }}/ansible/action_plugins:/usr/share/ansible_plugins/action_plugins
@@ -101,14 +131,68 @@ lookup_plugins     = {{ ansible_base }}/ansible/lookup_plugins:/usr/share/ansibl
 vars_plugins       = {{ ansible_base }}/ansible/vars_plugins:/usr/share/ansible_plugins/vars_plugins
 filter_plugins     = {{ ansible_base }}/ansible/filter_plugins:/usr/share/ansible_plugins/filter_plugins
 
+# by default callbacks are not loaded for /bin/ansible, enable this if you
+# want, for example, a notification or logging callback to also apply to 
+# /bin/ansible runs
+#bin_ansible_callbacks = False
+
+
 # don't like cows?  that's unfortunate.
 # set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1 
 #nocows = 1
 
+# set which cowsay stencil you'd like to use by default. When set to 'random',
+# a random stencil will be selected for each task. The selection will be filtered
+# against the `cow_whitelist` option below.
+#cow_selection = default
+#cow_selection = random
+
+# when using the 'random' option for cowsay, stencils will be restricted to this list.
+# it should be formatted as a comma-separated list with no spaces between names.
+# NOTE: line continuations here are for formatting purposes only, as the INI parser
+#       in python does not support them.
+#cow_whitelist=bud-frogs,bunny,cheese,daemon,default,dragon,elephant-in-snake,elephant,eyes,\
+#              hellokitty,kitty,luke-koala,meow,milk,moofasa,moose,ren,sheep,small,stegosaurus,\
+#              stimpy,supermilker,three-eyes,turkey,turtle,tux,udder,vader-koala,vader,www
+
 # don't like colors either?
 # set to 1 if you don't want colors, or export ANSIBLE_NOCOLOR=1
 #nocolor = 1
 
+# if set to a persistent type (not 'memory', for example 'redis') fact values
+# from previous runs in Ansible will be stored.  This may be useful when
+# wanting to use, for example, IP information from one group of servers
+# without having to talk to them in the same playbook run to get their
+# current IP information.
+#fact_caching = memory
+
+
+# retry files
+# When a playbook fails by default a .retry file will be created in ~/
+# You can disable this feature by setting retry_files_enabled to False
+# and you can change the location of the files by setting retry_files_save_path
+
+#retry_files_enabled = False
+#retry_files_save_path = ~/.ansible-retry
+
+
+# prevents logging of task data, off by default
+#no_log = False
+
+# prevents logging of tasks, but only on the targets, data is still logged on the master/controller
+#no_target_syslog = False
+
+# controls the compression level of variables sent to
+# worker processes. At the default of 0, no compression
+# is used. This value must be an integer from 0 to 9.
+#var_compression_level = 9
+
+[privilege_escalation]
+#become=True
+#become_method=sudo
+#become_user=root
+#become_ask_pass=False
+
 [paramiko_connection]
 
 # uncomment this line to cause the paramiko connection plugin to not record new host
@@ -125,7 +209,7 @@ filter_plugins     = {{ ansible_base }}/ansible/filter_plugins:/usr/share/ansibl
 # ssh arguments to use
 # Leaving off ControlPersist will result in poor performance, so use 
 # paramiko on older platforms rather than removing it
-# ssh_args = -o ControlMaster=auto -o ControlPersist=60s
+#ssh_args = -o ControlMaster=auto -o ControlPersist=60s
 
 # The path to use for the ControlPath sockets. This defaults to
 # "%(directory)s/ansible-ssh-%%h-%%p-%%r", however on some systems with
@@ -152,7 +236,28 @@ pipelining = True
 # (default is sftp)
 #scp_if_ssh = True
 
+# if False, sftp will not use batch mode to transfer files. This may cause some
+# types of file transfer failures impossible to catch however, and should
+# only be disabled if your sftp version has problems with batch mode
+#sftp_batch_mode = False
+
 [accelerate]
-accelerate_port = 5099
-accelerate_timeout = 30
-accelerate_connect_timeout = 5.0
+#accelerate_port = 5099
+#accelerate_timeout = 30
+#accelerate_connect_timeout = 5.0
+
+# The daemon timeout is measured in minutes. This time is measured
+# from the last activity to the accelerate daemon.
+#accelerate_daemon_timeout = 30 
+
+# If set to yes, accelerate_multi_key will allow multiple
+# private keys to be uploaded to it, though each user must
+# have access to the system via SSH to add a new key. The default
+# is "no".
+#accelerate_multi_key = yes
+
+[selinux]
+# file systems that require special treatment when dealing with security context
+# the default behaviour that copies the existing context or uses the user default
+# needs to be changed to use the file system dependent context.
+#special_context_filesystems=nfs,vboxsf,fuse,ramfs

roles/batcave/files/vmdiff.sh

@@ -5,7 +5,7 @@ diffout=$(mktemp tmp.XXXXXXXXX)
 mailto='admin@fedoraproject.org'
 source /root/sshagent >>/dev/null
 export ANSIBLE_HOST_KEY_CHECKING=False
-/srv/web/infra/ansible/scripts/list-vms-per-host --host=virtservers 2>/dev/null  > "$output"
+/srv/web/infra/ansible/scripts/list-vms-per-host.v2 --host=virtservers 2>/dev/null  > "$output"
 chmod 644 "$output"
 diff -u "$dest" "$output" > $diffout
 rc=$?