Merge remote-tracking branch 'origin/master' into youshallnotchanged

Former-commit-id: b3d921f1

roles/mailchimpLastlogin/templates/ldapconfig.yml.j2

@@ -2,5 +2,5 @@
 ldapDomain: {{ ldapBase }}
 user: {{ ldapBindDN }} 
 passwd: {{ ldapBindDNPassword }}
-ldapURI: {{ ldap URI }}
+ldapURI: {{ ldapURI }}
 cafile: {{ ldapCaCertFile }}

roles/mellanox_drivers/tasks/main.yml

@@ -5,7 +5,7 @@
   shell: "lspci | grep Mellanox"
   check_mode: yes
 
-- include_vars: mellanoxVars.yml
+#- include_vars: mellanoxVars.yml
 
 - name: yum install dependencies
   yum:  name=perl,pciutils,gtk2,atk,cairo,gcc-gfortran,libxml2-python,tcsh,libnl,lsof,tcl,tk,kernel-devel,python-devel,createrepo,rpm-build

roles/nat_server/tasks/main.yml

@@ -23,6 +23,8 @@
   # output looks like
   # 8.8.8.8 via 118.138.254.254 dev eth2  src 118.138.254.185
   shell: /usr/sbin/ip route get 8.8.8.8  | awk '{print $5;exit }'
+  check_mode: no
+  changed_when: false
   register: public_device_name
 
 #if not defined, default to M3=vlan 114  ;