From: nicoo <nicoo@realraum.at>
Date: Sat, 24 Nov 2018 15:29:12 +0000 (+0100)
Subject: Merge PR#35: add missing vlans in ansible network.yml
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=2fb00147adff89fa701ef21a4f6d0da696d27488;hp=e676385df52a359148dfd3df644a549dfb0c899f;p=noc.git

Merge PR#35: add missing vlans in ansible network.yml
---

diff --git a/ansible/roles/base/tasks/main.yml b/ansible/roles/base/tasks/main.yml
index 947987e..a0545df 100644
--- a/ansible/roles/base/tasks/main.yml
+++ b/ansible/roles/base/tasks/main.yml
@@ -78,6 +78,9 @@
       - nano
       - zsh
       - python-apt
+      - command-not-found
+      - man-db
+      - lshw
     state: present
 
 - when: base_managed_ntpd
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"