merge conflicts

playbooks/roles/common/defaults/main.yml

@@ -26,6 +26,9 @@ COMMON_CUSTOM_DHCLIENT_CONFIG: false
 # uncomment and specifity your domains.
 # COMMON_DHCLIENT_DNS_SEARCH: ["ec2.internal","example.com"]
   
+
+COMMON_MOTD_TEMPLATE: "motd.tail.j2"
+
 # Rotate logs to S3
 # Only for when edX is running in AWS since it organizes
 # logs by security group.

playbooks/roles/common/tasks/main.yml

@@ -100,7 +100,7 @@
 - name: add ssh-warning banner motd
   template: >
     dest=/etc/motd.tail
-    src=motd.tail.j2 mode=0755 owner=root group=root
+    src={{ COMMON_MOTD_TEMPLATE }} mode=0755 owner=root group=root
 
 - name: update ssh config
   template: >

playbooks/roles/common/templates/devstack_motd.tail.j2

+*******************************************************************
+*                                                                 *
+*   _   _| |\ \/ /                                                *
+* / -_) _` | >  <                                                 *
+* \___\__,_|/_/\_\                                                *
+*                                                                 *
+*  Instructions and troubleshooting:                              *
+*  https://github.com/edx/configuration/wiki/edX-Developer-Stack  *
+*******************************************************************

playbooks/vagrant-devstack.yml

@@ -9,6 +9,7 @@
     edx_platform_version: 'master'
     mongo_enable_journal: False
     EDXAPP_NO_PREREQ_INSTALL: 0
+    COMMON_MOTD_TEMPLATE: "devstack_motd.tail.j2"
   vars_files:
     - "group_vars/all"
   roles: