Skip to content

Commit 5bd7521

Browse files
always remove node_modules and re npm install
1 parent a6dbada commit 5bd7521

4 files changed

Lines changed: 35 additions & 20 deletions

File tree

ansible/beta-hosts/docks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var params = {
1414
// Only search for docks in the cluster security group
1515
{
1616
Name: 'instance.group-id',
17-
Values: ['sg-87ca04e3']
17+
Values: ['sg-d6e684b2']
1818
},
1919
// Only fetch instances that are tagged as docks
2020
{

ansible/roles/git_node_service/handlers/main.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

ansible/roles/git_node_service/tasks/main.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
src=upstart.conf
66
dest=/etc/init/{{ app_name }}.conf
77
backup=yes
8-
notify:
9-
- restart service {{ app_name }}
108

119
- name: create {{ app_name }} repository dir
1210
sudo: yes
@@ -25,6 +23,23 @@
2523
accept_hostkey=True
2624
force=yes
2725
key_file=/opt/runnable/dock-init/key/id_rsa_runnabledock
28-
notify:
29-
- npm install {{ app_name }}
30-
- restart service {{ app_name }}
26+
27+
- name: remove node_modules
28+
sudo: yes
29+
file:
30+
path=/opt/runnable/{{ app_name }}/node_modules
31+
state=absent
32+
33+
- name: npm install {{ app_name }}
34+
sudo: yes
35+
npm:
36+
path=/opt/runnable/{{ app_name }}
37+
state=latest
38+
production=yes
39+
40+
- name: restart service {{ app_name }}
41+
sudo: yes
42+
service:
43+
name={{ app_name }}
44+
state=restarted
45+
enabled=yes

ansible/roles/sauron/tasks/main.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
11
---
2+
- name: stop sauron on reset
3+
sudo: yes
4+
when: weave_reset is defined
5+
service:
6+
name={{ app_name }}
7+
state=stopped
8+
enabled=yes
9+
210
- name: reset weave
311
command: "{{ weave_path }} reset"
412
when: weave_reset is defined
513
sudo: yes
614

15+
- name: save and kill containers on weave reset
16+
sudo: yes
17+
when: weave_reset is defined
18+
shell: "sudo docker ps -q > ./good; cat ./good | xargs sudo docker kill"
19+
720
- name: install weave
821
get_url: url=https://github.com/weaveworks/weave/releases/download/v1.2.0/weave
922
dest="{{ weave_path }}"
@@ -21,11 +34,9 @@
2134
shell: "docker kill `docker ps | grep weave | awk '{print $1}'` || echo"
2235
when: weave_install.changed
2336
sudo: yes
24-
notify:
25-
- restart service {{ app_name }}
2637

2738
- name: get org id
2839
sudo: yes
2940
when: docker_config == "docks"
3041
shell: "cut -d, -f 1 /opt/runnable/host_tags"
31-
register: org_id
42+
register: org_id

0 commit comments

Comments
 (0)