Fix issues with apt-key and Deadsnakes repo on 14.04.

install.sh

@@ -23,9 +23,9 @@ if [ "" == "$PKG_OK" ]; then
     sudo apt-get install -q -y software-properties-common
     sudo add-apt-repository -y ppa:ansible/ansible
 
-    if [ $DISTRIB_RELEASE = "14.04" ]; then
-        sudo add-apt-repository -y ppa:fkrull/deadsnakes-python2.7
-    fi
+# if [ $DISTRIB_RELEASE = "14.04" ]; then
+#         sudo add-apt-repository -y ppa:fkrull/deadsnakes-python2.7
+#    fi
 
     sudo apt-get update
     sudo apt-get install -q -y python2.7 python-pip python-mysqldb ansible

util/ansible/roles/mariadb/tasks/main.yml

@@ -3,13 +3,17 @@
    template: src=mariadb_ubuntu.list.j2 dest=/etc/apt/sources.list.d/mariadb.list owner=root group=root mode=0644
    register: mariadb_list
 
- - name: Add repo key
+ - name: Add repo key (Xenial)
    apt_key: url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xF1656F24C74CD1D8 state=present
-   register: mariadb_key
+   when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial'
+
+ - name: Add repo key (Trusty)
+   apt_key: url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xCBCB082A1BB943DB state=present
+   when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
 
  - name: Update apt cache
    apt: update_cache=yes
-   when: mariadb_list.changed == True or mariadb_key.changed == True
+   when: mariadb_list.changed == True
 
  - name: Unattended package installation
    shell: export DEBIAN_FRONTEND=noninteractive