Merge pull request #32 from modcloth/print-unique-server-names-in-hip…

…chat-message Hipchat messages will now include the unique server name being deployed to
modcloth · Sep 30, 2014 · 8c9c8c6 · 8c9c8c6
2 parents e49ea5f + 7a15171
commit 8c9c8c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -24,7 +24,7 @@
   hipchat:
     token: "{{ hipchat_token }}"
     room: "{{ hipchat_room }}"
-    msg: "{{ lookup('file', modcloth_app_hipchat_html).replace('__ACTION__', 'deploying') }}"
+    msg: "{{ lookup('file', modcloth_app_hipchat_html).replace('__ACTION__', 'deploying').replace('__SERVER__', hostname ) }}"
     msg_format: html
     color: purple
   changed_when: False
@@ -59,7 +59,7 @@
   hipchat:
     token: "{{ hipchat_token }}"
     room: "{{ hipchat_room }}"
-    msg: "{{ lookup('file', modcloth_app_hipchat_html).replace('__ACTION__', 'done deploying') }}"
+    msg: "{{ lookup('file', modcloth_app_hipchat_html).replace('__ACTION__', 'done deploying').replace('__SERVER__', hostname ) }}"
     msg_format: html
     color: purple
   changed_when: False

diff --git a/templates/hipchat_notification.frag.html.j2 b/templates/hipchat_notification.frag.html.j2
@@ -9,4 +9,4 @@
 {% else %}
 {{ modcloth_app_docker_tag }}
 {% endif %}
-{{ modcloth_app_tag_annotation }} to {{ hostname | default(ansible_fqdn) }}
+{{ modcloth_app_tag_annotation }} to __SERVER__