Merge pull request #2601 from edx/feanil/change_ppas

Feanil/change ppas

playbooks/roles/common/tasks/main.yml

@@ -11,20 +11,27 @@
 # Determine if machine is provisioned via vagrant
 # Some EC2-specific steps would need to be skipped
 - name: check if instance is vagrant
-  stat: 
+  stat:
     path: /home/vagrant
   register: vagrant_home_dir
 
+- name: add edx ppa apt key
+  apt_key:
+    id: "{{ COMMON_EDX_PPA_KEY_ID }}"
+    keyserver: "{{ COMMON_EDX_PPA_KEY_SERVER }}"
+    state: "present"
+
 # Ensure that we get a current version of Git
 # GitHub requires version 1.7.10 or later
 # https://help.github.com/articles/https-cloning-errors
 - name: Add git apt repository
-  apt_repository: 
+  apt_repository:
     repo: "{{ common_git_ppa }}"
 
-# Ensure that we get the latest version of python 2.7
-- name: Add python 2.7 apt repository
-  apt_repository: repo="{{ common_python_ppa }}"
+# We use this PPA to get the latest version of python 2.7
+- name: Add edx apt repository
+  apt_repository:
+    repo: "{{ COMMON_EDX_PPA }}"
 
 - name: Install role-independent useful system packages
   # do this before log dir setup; rsyslog package guarantees syslog user present

playbooks/roles/common_vars/defaults/main.yml

@@ -43,6 +43,10 @@ COMMON_PYPI_MIRROR_URL: 'https://pypi.python.org/simple'
 COMMON_NPM_MIRROR_URL: 'http://registry.npmjs.org'
 COMMON_UBUNTU_APT_KEYSERVER: "http://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search="
 
+COMMON_EDX_PPA: "deb http://ppa.edx.org {{ ansible_distribution_release }} main"
+COMMON_EDX_PPA_KEY_SERVER: "pgp.mit.edu"
+COMMON_EDX_PPA_KEY_ID: "69464050"
+
 #The git checkout url in most roles is constructed from these values
 #e.g. https://{{COMMON_GIT_MIRROR}}/{{COMMON_GIT_PATH}}/repo.git
 COMMON_GIT_PROTOCOL: 'https'  # https|ssh
@@ -108,7 +112,6 @@ common_web_group: www-data
 common_log_user: syslog
 
 common_git_ppa: "ppa:git-core/ppa"
-common_python_ppa: "ppa:fkrull/deadsnakes-python2.7"
 
 # Skip supervisor tasks
 # When set to true this flag will allow you to install everything but keep