瀏覽代碼

Allow to enable_vnc for provisioned VMs.

pull/75/head
Martin Horak 6 年之前
父節點
當前提交
0d183cb7b5
共有 2 個文件被更改,包括 15 次插入0 次删除
  1. +3
    -0
      _modules/virtng.py
  2. +12
    -0
      salt/control/virt.sls

+ 3
- 0
_modules/virtng.py 查看文件

@@ -236,6 +236,9 @@ def _gen_xml(name,
else:
context['boot_dev'] = ['hd']

if 'enable_vnc' in kwargs:
context['enable_vnc'] = kwargs['enable_vnc']
log.info('VNC enabled: {0}.'.format(kwargs['enable_vnc']))
if 'serial_type' in kwargs:
context['serial_type'] = kwargs['serial_type']
if 'serial_type' in context and context['serial_type'] == 'tcp':

+ 12
- 0
salt/control/virt.sls 查看文件

@@ -33,6 +33,13 @@ salt_libvirt_service:
{%- set rng = cluster.rng %}
{%- endif %}

{%- if cluster.enable_vnc is defined and cluster.enable_vnc %}
{%- set enable_vnc = True %}
{%- else %}
{%- set enable_vnc = False %}
{%- endif %}


{%- for node_name, node in cluster.node.iteritems() %}

{%- if node.name is defined %}
@@ -80,6 +87,11 @@ salt_control_virt_{{ cluster_name }}_{{ node_name }}:
seed: True
serial_type: pty
console: True
{%- if node.enable_vnc is defined %}
enable_vnc: {{ node.enable_vnc }}
{%- else %}
enable_vnc: {{ enable_vnc }}
{%- endif %}
{%- if node.img_dest is defined %}
img_dest: {{ node.img_dest }}
{%- endif %}

Loading…
取消
儲存