From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 24 Nov 2018 15:28:59 +0000 (+0100)
Subject: Merge pull request #34 from realraum/ansible/base
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=bd8bd85f2a5b40efd8094f2c1ee3b9fa511faeeb;hp=4ea431cc6e851322290920bcce535ba4ad9da60a;p=noc.git

Merge pull request #34 from realraum/ansible/base

ansible/base: Add some useful packages
---

diff --git a/ansible/roles/vm/guest/tasks/main.yml b/ansible/roles/vm/guest/tasks/main.yml
index 17c1a53..e328026 100644
--- a/ansible/roles/vm/guest/tasks/main.yml
+++ b/ansible/roles/vm/guest/tasks/main.yml
@@ -7,7 +7,7 @@
   lineinfile:
     path: /etc/default/rng-tools
     line: '{{ item.key }}={{ item.value }}'
-    regexp: '^#?{{ item.key }}={{ item.value }}'
+    regexp: '^#?{{ item.key }}='
   with_dict: '{{ rngd_config }}'
   loop_control:
     label: "{{ item.key }}"
diff --git a/ansible/roles/vm/install/tasks/main.yml b/ansible/roles/vm/install/tasks/main.yml
index aaa881e..034cf1d 100644
--- a/ansible/roles/vm/install/tasks/main.yml
+++ b/ansible/roles/vm/install/tasks/main.yml
@@ -99,7 +99,7 @@
   wait_for_virt:
     name: "{{ vmname }}"
     states: shutdown,crashed
-    timeout: 900
+    timeout: 1800
   register: installer_result
   failed_when: installer_result.failed or installer_result.state == "crashed"