Merge pull request #2017 from edx/e0d/fix-aws-leakage

Move aws specific task to aws role.

playbooks/roles/aws/tasks/main.yml

@@ -112,3 +112,19 @@
     job: "{{ aws_s3_sync_script }} > /dev/null 2>&1"
     state: absent
   when: AWS_S3_LOGS
+
+ # update the ssh motd on Ubuntu
+ # Remove some of the default motd display on ubuntu
+ # and add a custom motd.  These do not require an
+ # ssh restart
+ # Only needed for EC2 instances.
+- name: update the ssh motd on Ubuntu
+  file: >
+    mode=0644
+    path={{ item }}
+  when: vagrant_home_dir.stat.exists == false
+  with_items:
+  - "/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"

playbooks/roles/common/tasks/main.yml

@@ -108,21 +108,6 @@
   template: src=etc/dhcp/dhclient.conf.j2 dest=/etc/dhcp/dhclient.conf
   when: COMMON_CUSTOM_DHCLIENT_CONFIG
 
-  # Remove some of the default motd display on ubuntu
-  # and add a custom motd.  These do not require an
-  # ssh restart
-  # Only needed for EC2 instances.
-- name: update the ssh motd on Ubuntu
-  file: >
-    mode=0644
-    path={{ item }}
-  when: vagrant_home_dir.stat.exists == false
-  with_items:
-  - "/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"
-
 - name: add ssh-warning banner motd
   template: >
     dest=/etc/motd.tail
@@ -133,3 +118,4 @@
     dest=/etc/ssh/sshd_config
     src=sshd_config.j2 mode=0644 owner=root group=root
   notify: restart ssh
+  
\ No newline at end of file