Merge branch 'master' of mdgithub:tissuemaps/tmsetup

TissueMAPS · Nov 15, 2016 · 8e80de2 · 8e80de2
2 parents ed350c8 + 722cf47
commit 8e80de2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/tmsetup/share/playbooks/roles/cloud-instance/tasks/gce.yml b/tmsetup/share/playbooks/roles/cloud-instance/tasks/gce.yml
@@ -33,6 +33,7 @@
     subnet_region: "{{ region | regex_replace('^(.*)-[a-z]$', '\\1') }}"
     ipv4_range: "{{ ip_range }}"
   run_once: yes
+  register: network_facts
   when: instance_state == "present"
 
 - name: Create web firewall
@@ -46,7 +47,9 @@
     target_tags:
       - web
   run_once: yes
-  when: instance_state == "present"
+  # TODO: There seems to be a bug in Ansible with already existing firewalls
+  # and subnetworks
+  when: instance_state == "present" and network_facts.changed
 
 - name: Create compute-storage firewall
   local_action: gce_net
@@ -63,7 +66,7 @@
       - compute
       - storage
   run_once: yes
-  when: instance_state == "present"
+  when: instance_state == "present" and network_facts.changed
 
 - name: Create boot disk
   local_action: gce_pd

diff --git a/tmsetup/share/playbooks/roles/tmaps-common/tasks/opencv.yml b/tmsetup/share/playbooks/roles/tmaps-common/tasks/opencv.yml
@@ -102,7 +102,10 @@
 
 - name: Fix OpenCV driver issue
   become: yes
-  shell: ln /dev/null /dev/raw1394
+  file:
+    src=/dev/null
+    dest=/dev/raw1394
+    state=hard
   tags:
     - opencv
     - python
diff --git a/tmsetup/share/playbooks/roles/tmaps-web/tasks/postgresql_client.yml b/tmsetup/share/playbooks/roles/tmaps-web/tasks/postgresql_client.yml
@@ -34,6 +34,7 @@
 - name: Update db password in TissueMAPS configuration
   ini_file:
     dest={{ tmaps_config_file }}
+    create=yes
     section=DEFAULT
     state=present
     option=db_password