Merge remote-tracking branch 'origin/master' into add-newrelic-deploy…

…ments

Conflicts:
	tasks/main.yml

README.md

@@ -18,6 +18,10 @@ pull docker containers.
 modcloth_app_name: app
 
 # The type of application to be deployed, either "long-running" or "cron"
+# 'cron' should be used for applications that should run on a schedule (e.g. a rake task)
+#   A cron entry will be inserted to run this task (as root)
+# 'long-running' should be used for applications that behave as services and should always be up
+#   An upstart job will be created to run your service (as root)
 modcloth_app_type: long-running
 
 # Environment variable mapping written to /etc/default/{{ modcloth_app_name }}

defaults/main.yml

@@ -3,6 +3,10 @@
 modcloth_app_name: app
 
 # The type of application to be deployed, either "long-running" or "cron"
+# 'cron' should be used for applications that should run on a schedule (e.g. a rake task)
+#   A cron entry will be inserted to run this task (as root)
+# 'long-running' should be used for applications that behave as services and should always be up
+#   An upstart job will be created to run your service (as root)
 modcloth_app_type: long-running
 
 # Environment variable mapping written to /etc/default/{{ modcloth_app_name }}

example.yml

@@ -14,12 +14,14 @@
     modcloth_app_docker_volumes:
       - { host: /var/log/foo, container: /var/logfoo, permissions: ro }
 
+  # To be used with applications that should run on a schedule (e.g. a rake task)
   - role: modcloth.app
     modcloth_app_name: modcloth-cron-app
     modcloth_app_type: cron
     modcloth_app_docker_args:
       - '--link memcached:memcached'
     modcloth_app_docker_command: date
+    modcloth_app_cron_schedule: '*/5 * * * *'
     modcloth_app_docker_repo: busybox
     modcloth_app_cron_stdin_command: date
     modcloth_app_env:

tasks/main.yml

@@ -17,18 +17,21 @@
     mode=0644
   changed_when: False
   when: hipchat_token != "" and hipchat_room != ""
+  ignore_errors: True
 
 - name: notify hipchat deploy started
   sudo: false
   connection: local
   hipchat:
     token: "{{ hipchat_token }}"
     room: "{{ hipchat_room }}"
-    msg: "{{ lookup('file', modcloth_app_hipchat_html).replace('__ACTION__', 'deploying').replace('__SERVER__', hostname ) }}"
+    msg: "{{ lookup('file', modcloth_app_hipchat_html).replace('__ACTION__', 'deploying').replace('__NETWORK_ENV__', env ) }}"
     msg_format: html
-    color: purple
+    color: yellow
   changed_when: False
   when: hipchat_token != "" and hipchat_room != ""
+  ignore_errors: True
+  run_once: yes
 
 - name: write etc default file
   template:
@@ -59,11 +62,13 @@
   hipchat:
     token: "{{ hipchat_token }}"
     room: "{{ hipchat_room }}"
-    msg: "{{ lookup('file', modcloth_app_hipchat_html).replace('__ACTION__', 'done deploying').replace('__SERVER__', hostname ) }}"
+    msg: "{{ lookup('file', modcloth_app_hipchat_html).replace('__ACTION__', 'done deploying').replace('__NETWORK_ENV__', env ) }}"
     msg_format: html
-    color: purple
+    color: green
   changed_when: False
   when: hipchat_token != "" and hipchat_room != ""
+  ignore_errors: True
+  run_once: yes
 
 - name: notify new relic deploy complete
   sudo: false
@@ -73,4 +78,5 @@
     revision="{{modcloth_app_docker_tag}}"
     user="{{modcloth_app_deployer}}"
   when: modcloth_app_notify_new_relic|bool
-  ignore_errors: yes
+  ignore_errors: True
+  run_once: yes

templates/hipchat_notification.frag.html.j2

@@ -9,4 +9,4 @@
 {% else %}
 {{ modcloth_app_docker_tag }}
 {% endif %}
-{{ modcloth_app_tag_annotation }} to __SERVER__
+{{ modcloth_app_tag_annotation }} to __NETWORK_ENV__