Merge branch 'upstream' into 1369-integrate-ensure-dependencies-script
1369 - Use explicit revision IDs rather than "tip" for dependencies
1369 - Integrate ensure_dependencies.py with kick.py
112 - Use of DNS entry to match the legacy servers
1369 - Address issues mentioned during external code-review
1369 - Fix wrong git:* commit id for infrastructure-puppet-concat
1369 - Improve Vagrant(file) dependency hook
Merge branch '1369-integrate-ensure-dependencies-script' into 122-dns-entries
112 - Use of host_aliases to legacy servers
112 - Use the complete FQDN on the hosts file
Merge branch '122-external-node-classifier' into 122-dns-entries
122 - Use host aliases for the ip in ssh configuration
122 - Use of authority variable to get FQDN wihout hardcode it
122 - Use of the first ip for host resource
122 - Erase unnecesary string syntax for using just variables
122 - Use a better name for the internal ip
Merge remote-tracking branch 'upstream/122-external-node-classifier' into 122-dns-entries
112 - Fix whitespace / indentation
Merge pull request #5 from poz2k4444/122-dns-entries

112 - Introduce dns: option for hosts.yaml