Merge branch 'master' of git://gitorious.research-infrastructures.eu/infrastructure-management/ansible-playbooks

hadoop/HDP/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 # See http://docs.hortonworks.com/HDPDocuments/Ambari-2.4.1.0/bk_ambari-installation/content/download_the_ambari_repo_ubuntu14.html
 hdp_ambari_install: False
-hdp_ambari_repo_url: 'http://public-repo-1.hortonworks.com/ambari/ubuntu14/2.x/updates/2.4.1.0/ambari.list'
+hdp_ambari_repo_url: 'http://public-repo-1.hortonworks.com/ambari/ubuntu14/2.x/updates/2.6.0.0/ambari.list'
 hdp_ambari_repo_key: 'B9733A7A07513CAD'
 
 ambari_use_separate_postgres_db: False

mongodb/tasks/main.yml

@@ -6,7 +6,7 @@
   tags: mongodb
 
 - name: Install the mongodb repository
-  ansible_repository: repo="deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" update_cache=yes state=present
+  apt_repository: repo="deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" update_cache=yes state=present
   when: mongodb_install_from_external_repo
   register: external_repo
   tags: mongodb

postgresql/defaults/main.yml

@@ -70,7 +70,7 @@ psql_ssl_ca_file: '/var/lib/acme/live/{{ ansible_fqdn }}/chain'
 psql_conf_ssl_parameters: 
   - { name: 'ssl', value: 'true' }
   - { name: 'ssl_cert_file', value: '{{ psql_ssl_cert_file }}' }
-  - { name: 'ssl_key_file', value: '{{ psql_ssl_privkey_path }}' }
+  - { name: 'ssl_key_file', value: '{{ psql_ssl_privkey_file }}' }
   - { name: 'ssl_ca_file', value: '{{ psql_ssl_ca_file }}' }
 
 psql_conf_disable_ssl_parameters: