Commit fec3e778 by Joseph Mulloy

Remove 12.04/precise from ansible roles OPS-1849

parent c7065634
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
keypair: continuous-integration keypair: continuous-integration
instance_type: t2.medium instance_type: t2.medium
security_group: sandbox-vpc security_group: sandbox-vpc
# ubuntu 12.04 # ubuntu 16.04 - 20170721
ami: ami-f478849c ami: ami-cd0f5cb6
region: us-east-1 region: us-east-1
zone: us-east-1c zone: us-east-1c
instance_tags: instance_tags:
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
pre_tasks: pre_tasks:
- set_fact: - set_fact:
STOP_ALL_EDX_SERVICES_EXTRA_ARGS: "--no-wait" STOP_ALL_EDX_SERVICES_EXTRA_ARGS: "--no-wait"
when: ansible_distribution_release == 'precise' or ansible_distribution_release == 'trusty' when: ansible_distribution_release == 'trusty'
roles: roles:
- stop_all_edx_services - stop_all_edx_services
......
...@@ -157,7 +157,6 @@ common_debian_variants: ...@@ -157,7 +157,6 @@ common_debian_variants:
# We only have to install old Python for these releases: # We only have to install old Python for these releases:
old_python_ppa_releases: old_python_ppa_releases:
- precise
- trusty - trusty
common_redhat_variants: common_redhat_variants:
......
...@@ -109,16 +109,6 @@ ...@@ -109,16 +109,6 @@
- install - install
- install:base - install:base
# adding chris-lea nodejs repo
# TODO: 16.04
- name: add ppas for current versions of nodejs
apt_repository:
repo: "{{ edxapp_chrislea_ppa }}"
when: ansible_distribution_release == 'precise'
tags:
- install
- install:base
- name: install system packages on which LMS and CMS rely - name: install system packages on which LMS and CMS rely
apt: apt:
name: "{{ item }}" name: "{{ item }}"
......
...@@ -218,7 +218,5 @@ insights_debian_pkgs: ...@@ -218,7 +218,5 @@ insights_debian_pkgs:
- gettext - gettext
insights_release_specific_debian_pkgs: insights_release_specific_debian_pkgs:
precise:
- openjdk-7-jdk
xenial: xenial:
- openjdk-8-jdk - openjdk-8-jdk
...@@ -14,7 +14,7 @@ mongo_log_dir: "{{ COMMON_LOG_DIR }}/mongo" ...@@ -14,7 +14,7 @@ mongo_log_dir: "{{ COMMON_LOG_DIR }}/mongo"
mongo_journal_dir: "{{ COMMON_DATA_DIR }}/mongo/mongodb/journal" mongo_journal_dir: "{{ COMMON_DATA_DIR }}/mongo/mongodb/journal"
mongo_user: mongodb mongo_user: mongodb
MONGODB_REPO: "deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.0 multiverse" MONGODB_REPO: "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.0 multiverse"
MONGODB_APT_KEY: "7F0CEB10" MONGODB_APT_KEY: "7F0CEB10"
MONGODB_APT_KEYSERVER: "keyserver.ubuntu.com" MONGODB_APT_KEYSERVER: "keyserver.ubuntu.com"
......
...@@ -33,22 +33,6 @@ ...@@ -33,22 +33,6 @@
# Thought that instead of performing all those steps and get the repo, why not directly use this repo # Thought that instead of performing all those steps and get the repo, why not directly use this repo
# `deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6`, I just picked this line and directly used it and it worked for us. # `deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6`, I just picked this line and directly used it and it worked for us.
- name: Add MySQL community apt key
apt_key:
id: 8C718D3B5072E1F5
keyserver: "{{ COMMON_EDX_PPA_KEY_SERVER }}"
state: present
when: ansible_distribution_release == 'precise'
# Despite ondrej's ppa having 12.04 support, we would need to do shenanigans and uninstalling
# to switch back cleanly without publishing a new base devstack box. Easier to just clean this
# up with Ficus.
- name: Install MySQL from their community PPA
apt_repository:
repo: "deb http://repo.mysql.com/apt/ubuntu/ precise mysql-5.6"
update_cache: yes
when: ansible_distribution_release == 'precise'
- name: Install mysql-5.6 and dependencies - name: Install mysql-5.6 and dependencies
apt: apt:
name: "{{ item }}" name: "{{ item }}"
......
...@@ -115,14 +115,14 @@ ...@@ -115,14 +115,14 @@
- install - install
- install:base - install:base
# 12.04, 14.04, etc. # 14.04
- name: Create supervisor upstart job - name: Create supervisor upstart job
template: template:
src: "etc/init/supervisor-upstart.conf.j2" src: "etc/init/supervisor-upstart.conf.j2"
dest: "/etc/init/{{ supervisor_service }}.conf" dest: "/etc/init/{{ supervisor_service }}.conf"
owner: root owner: root
group: root group: root
when: ansible_distribution_release == 'precise' or ansible_distribution_release == 'trusty' when: ansible_distribution_release == 'trusty'
tags: tags:
- install - install
- install:base - install:base
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
group: root group: root
when: > when: >
supervisor_service == "supervisor" and disable_edx_services and not devstack supervisor_service == "supervisor" and disable_edx_services and not devstack
and (ansible_distribution_release == 'precise' or ansible_distribution_release == 'trusty') and (ansible_distribution_release == 'trusty')
tags: tags:
- to-remove - to-remove
- aws-specfic - aws-specfic
......
--- ---
# The deadsnakes PPA is required to install python3.5 on Precise and Trusty. # The deadsnakes PPA is required to install python3.5 on Trusty.
# Xenial comes with python3.5 installed. # Xenial comes with python3.5 installed.
- name: add deadsnakes repository - name: add deadsnakes repository
apt_repository: apt_repository:
repo: "ppa:fkrull/deadsnakes" repo: "ppa:fkrull/deadsnakes"
when: ansible_distribution_release == 'precise' or ansible_distribution_release == 'trusty' when: ansible_distribution_release == 'trusty'
tags: tags:
- install - install
- install:system-requirements - install:system-requirements
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
with_items: with_items:
- python3.5 - python3.5
- python3.5-dev - python3.5-dev
when: ansible_distribution_release == 'precise' or ansible_distribution_release == 'trusty' when: ansible_distribution_release == 'trusty'
tags: tags:
- install - install
- install:system-requirements - install:system-requirements
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment