Merge pull request #183 from CodeNow/bump-weave

Bump weave

Author: anandkumarpatel

ansible/group_vars/alpha-sauron.yml

@@ -1,12 +1,18 @@
 # upstart template variables
 name: sauron
 
-app_name: {{ name }}
+app_name: "{{ name }}"
 app_repo: "git@github.com:CodeNow/{{ name }}.git"
 
 redis_host: "{{ hostvars[groups['redis'][0]]['ansible_default_ipv4']['address'] }}"
 redis_port: 6379
 
 enviroment_vars:
+  LOGGLY_TOKEN: "{{ loggly_token }}"
+  ORG_ID: "{{ org_id.stdout }}"
+  RABBITMQ_HOSTNAME: "{% if rabbit_host is defined %}{{ rabbit_host }}{% else %}{{ hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address'] }}{% endif %}"
+  RABBITMQ_PASSWORD: "{{ rabbit_password }}"
+  RABBITMQ_PORT: "{{ rabbit_port }}"
+  RABBITMQ_USERNAME: "{{ rabbit_username }}"
   REDIS_IPADDRESS: "{{ redis_host }}"
-  REDIS_PORT: "{{ redis_port }}"
+  REDIS_PORT: "{{ redis_port }}"

ansible/roles/git_node_service/handlers/main.yml

@@ -5,8 +5,6 @@
     src=upstart.conf
     dest=/etc/init/{{ app_name }}.conf
     backup=yes
-  notify:
-    - restart service {{ app_name }}
 
 - name: create {{ app_name }} repository dir
   sudo: yes
@@ -25,6 +23,23 @@
     accept_hostkey=True
     force=yes
     key_file=/opt/runnable/dock-init/key/id_rsa_runnabledock
-  notify:
-    - npm install {{ app_name }}
-    - restart service {{ app_name }}
+
+- name: remove node_modules
+  sudo: yes
+  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
+    production=yes
+
+- name: restart service {{ app_name }}
+  sudo: yes
+  service:
+    name={{ app_name }}
+    state=restarted
+    enabled=yes

ansible/roles/git_node_service/tasks/main.yml

@@ -1,25 +1,47 @@
 ---
+- name: stop sauron on reset
+  sudo: yes
+  when: weave_reset is defined
+  service:
+    name={{ app_name }}
+    state=stopped
+    enabled=yes
+
 - name: reset weave
-  command: "{{weave_path}} reset"
+  command: "{{ weave_path }} reset"
   when: weave_reset is defined
   sudo: yes
 
+- name: save non weave / image builder containers
+  sudo: yes
+  when: weave_reset is defined
+  shell: "sudo docker ps | grep -v weaveworks | grep -v image-builder > ./good"
+
+- name: kill all containers
+  sudo: yes
+  when: weave_reset is defined
+  shell: "sudo docker ps -q | xargs sudo docker kill"
+
 - name: install weave
-  get_url: url=https://github.com/zettio/weave/releases/download/v0.11.1/weave
-    dest="{{weave_path}}"
+  get_url: url=https://github.com/weaveworks/weave/releases/download/v1.2.0/weave
+    dest="{{ weave_path }}"
     mode=0777
     force=yes
   sudo: yes
   register: weave_install
 
 - name: setup weave
-  command: "{{weave_path}} setup"
+  command: "{{ weave_path }} setup"
   when: weave_install.changed
   sudo: yes
 
 - name: stop previous weave
   shell: "docker kill `docker ps | grep weave | awk '{print $1}'` || echo"
   when: weave_install.changed
   sudo: yes
-  notify:
-    - restart service {{ app_name }}
+
+- 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

@@ -1,4 +1,5 @@
 ---
+- hosts: rabbitmq
 - hosts: redis
 
 - hosts: docks