add option to globally disable rng device
related to bug: PROD-20139
Change-Id: I32fee91f22e0963ec60de63b4c6e020df92f9f3b
diff --git a/README.rst b/README.rst
index de8b4a6..d61fedb 100644
--- a/README.rst
+++ b/README.rst
@@ -408,12 +408,15 @@
mycluster:
domain: neco.virt.domain.com
engine: virt
+ #Option to set rng globaly
+ rng: false
node:
ubuntu1:
provider: node01.domain.com
image: ubuntu.qcow
size: medium
img_dest: /var/lib/libvirt/ssdimages
+ #Rng defined on node will have higher priority then global one
rng:
backend: /dev/urandom
model: random
diff --git a/salt/control/virt.sls b/salt/control/virt.sls
index 9177d20..f85af14 100644
--- a/salt/control/virt.sls
+++ b/salt/control/virt.sls
@@ -20,6 +20,11 @@
{%- if cluster.engine == "virt" %}
+##Posibility to disable rng device globally for old libvirt version
+{%- if cluster.rng is defined %}
+{%- set rng = cluster.rng %}
+{%- endif %}
+
{%- for node_name, node in cluster.node.iteritems() %}
{%- if node.name is defined %}
@@ -30,7 +35,6 @@
{%- set size = control.size.get(node.size) %}
-
salt_control_virt_{{ cluster_name }}_{{ node_name }}:
module.run:
- name: virtng.init
@@ -41,8 +45,10 @@
- start: True
- disk: {{ size.disk_profile }}
- nic: {{ size.net_profile }}
- {%- if node.rng is defined %}
- - rng: {{ node.rng }}
+ {%- if node.rng is defined %}
+ - rng: {{ node.rng }}
+ {%- elif rng is defined %}
+ - rng: {{ rng }}
{%- endif %}
- kwargs:
seed: True