Address comments

playbooks/roles/aws/tasks/main.yml

@@ -99,15 +99,10 @@
 
 - name: Update the ssh motd on Ubuntu
   file:
-    path: "{{ item.0 }}"
+    path: "{{ item.item }}"
     mode: "0644"
   when: >
     vagrant_home_dir.stat.exists == false and
     ansible_distribution in common_debian_variants and
-    item.1.stat.exists
-  with_together:
-    - - "/etc/update-motd.d/10-help-text"
-      - "/usr/share/landscape/landscape-sysinfo.wrapper"
-      - "/etc/update-motd.d/51-cloudguest"
-      - "/etc/update-motd.d/91-release-upgrade"
-    - motd_files_exist.results
+    item.stat.exists
+  with_items: motd_files_exist.results

playbooks/roles/common/tasks/main.yml

@@ -75,7 +75,7 @@
   apt:
     name: "{{ item }}"
     install_recommends: yes
-    state: present 
+    state: present
     update_cache: yes
   with_items: "{{ common_custom_debian_pkgs }}"
   when: >

playbooks/roles/common_vars/defaults/main.yml

@@ -115,7 +115,7 @@ common_debian_pkgs:
   - python-pip
   - python2.7-dev
 
-# Packages that should be installed from our custom PPA, i.e. COMMON_EDX_PPA 
+# Packages that should be installed from our custom PPA, i.e. COMMON_EDX_PPA
 common_custom_debian_pkgs:
   - "python2.7=2.7.10-0+{{ ansible_distribution_release }}1"
 

playbooks/roles/supervisor/tasks/main.yml

@@ -121,19 +121,7 @@
     dest: "/etc/init/{{ supervisor_service }}.conf"
     owner: root
     group: root
-  when: ansible_distribution_major_version < 16
-  tags:
-    - install
-    - install:base
-
-# NB: with systemd, pre_supervisor is a pre-task for supervisor, not a separate service
-- name: Create supervisor systemd job
-  template:
-    src: "etc/init/supervisor-systemd.service.j2"
-    dest: "/etc/systemd/system/{{ supervisor_service }}.service"
-    owner: root
-    group: root
-  when: ansible_distribution_major_version >= 16
+  when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version < 16
   tags:
     - install
     - install:base
@@ -149,11 +137,23 @@
     group: root
   when: >
     supervisor_service == "supervisor" and disable_edx_services and not devstack
-    and ansible_distribution_major_version < 16
+    and ansible_distribution == 'Ubuntu' and ansible_distribution_major_version < 16
   tags:
     - to-remove
     - aws-specfic
 
+# NB: with systemd, pre_supervisor is a pre-task for supervisor, not a separate service
+- name: Create supervisor systemd job
+  template:
+    src: "etc/init/supervisor-systemd.service.j2"
+    dest: "/etc/systemd/system/{{ supervisor_service }}.service"
+    owner: root
+    group: root
+  when: not (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version < 16)
+  tags:
+    - install
+    - install:base
+
 - name: Write the pre_suprevisor python script
   copy:
     src: pre_supervisor_checks.py
@@ -217,7 +217,7 @@
   service:
     name: "{{ supervisor_service }}.service"
     enabled: yes
-  when: ansible_distribution_major_version >= 16
+  when: not (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version < 16)
   tags:
     - install
     - install:base