Merge remote-tracking branch 'origin/master' into SAN-2841

Author: Bryan Kendall

.gitignore

@@ -2,3 +2,6 @@ node_modules
 ca-key.pem
 pass
 hellorunnable
+dump.rdb
+erl_crash.dump
+npm-debug.log

ansible/group_vars/alpha-khronos.yml

@@ -14,7 +14,7 @@ container_envs: >
   -e DATADOG_HOST={{ datadog_host }}
   -e DATADOG_PORT={{ datadog_port }}
   -e KHRONOS_MONGO=mongodb://{{ khronos_mongo_auth }}@{{ mongo_hosts }}/{{ khronos_mongo_database }}
-  -e LOG_LEVEL_STDOUT=trace
+  -e LOG_LEVEL=info
   -e NODE_ENV={{ node_env }}
   -e RABBITMQ_HOSTNAME={{ rabbit_host | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}
   -e RABBITMQ_PASSWORD={{ rabbit_password }}

ansible/roles/git_node_service/tasks/main.yml

@@ -1,11 +1,4 @@
 ---
-- name: copy config file
-  sudo: yes
-  template:
-    src=upstart.conf
-    dest=/etc/init/{{ app_name }}.conf
-    backup=yes
-
 - name: create {{ app_name }} repository dir
   sudo: yes
   file:
@@ -26,12 +19,12 @@
 
 - name: remove node_modules
   sudo: yes
+  when: remove_node_modules is defined
   file:
     path=/opt/runnable/{{ app_name }}/node_modules
     state=absent
 
 - name: npm install {{ app_name }}
-  sudo: yes
   npm:
     path=/opt/runnable/{{ app_name }}
     state=latest

ansible/roles/git_node_service/templates/upstart.conf

@@ -39,9 +39,3 @@
   shell: "docker kill `docker ps | grep weave | awk '{print $1}'` || echo"
   when: weave_install.changed
   sudo: yes
-
-- name: get org id
-  sudo: yes
-  when: docker_config == "docks"
-  shell: "cut -d, -f 1 /opt/runnable/host_tags"
-  register: org_id

ansible/roles/sauron/tasks/main.yml

@@ -130,7 +130,7 @@ Host hubot
 # beta
 ################################################################################
 Host beta-bastion
-  HostName 52.25.33.149
+  HostName 52.24.221.234
 
 Host 10.20.*.*
   User ubuntu