Minor role fixes
in this commit we are removing dhcp from the networks, fixing vnc listen ip addresses, and console log output directories Change-Id: I61a77baa343720583b1ebfb2e4519803f1f32676
This commit is contained in:
parent
f3cbed1d96
commit
493796b94c
@ -69,10 +69,6 @@ airship_gate_libvirt_networks:
|
|||||||
ip:
|
ip:
|
||||||
address: "{{ airship_gate_ipam.nat_network.bridge_ip }}"
|
address: "{{ airship_gate_ipam.nat_network.bridge_ip }}"
|
||||||
netmask: "255.255.255.0"
|
netmask: "255.255.255.0"
|
||||||
dhcp:
|
|
||||||
- range:
|
|
||||||
start: "{{ airship_gate_ipam.nat_network.dhcp_start }}"
|
|
||||||
end: "{{ airship_gate_ipam.nat_network.dhcp_end }}"
|
|
||||||
- network_action: create
|
- network_action: create
|
||||||
autostart: false
|
autostart: false
|
||||||
name: "{{ airship_gate_names.provision_network }}"
|
name: "{{ airship_gate_names.provision_network }}"
|
||||||
|
@ -75,6 +75,8 @@
|
|||||||
name: libvirt-domain
|
name: libvirt-domain
|
||||||
vars:
|
vars:
|
||||||
libvirt_domain:
|
libvirt_domain:
|
||||||
|
enable_vnc: true
|
||||||
|
console_log_enabled: true
|
||||||
state: shutdown
|
state: shutdown
|
||||||
name: "{{ airship_gate_names.ephemeral_vm }}"
|
name: "{{ airship_gate_names.ephemeral_vm }}"
|
||||||
memory_mb: "{{ chosen_flavor.ephemeral_vm_memory_mb }}"
|
memory_mb: "{{ chosen_flavor.ephemeral_vm_memory_mb }}"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# The default directory in which to store VM console logs, if a VM-specific log
|
# The default directory in which to store VM console logs, if a VM-specific log
|
||||||
# file path is not given.
|
# file path is not given.
|
||||||
libvirt_vm_default_console_log_dir: "/var/log/libvirt-consoles/"
|
libvirt_vm_default_console_log_dir: "/var/log/libvirt-consoles"
|
||||||
|
|
||||||
# The default location for libvirt images
|
# The default location for libvirt images
|
||||||
libvirt_volume_default_images_path: '/var/lib/libvirt/images'
|
libvirt_volume_default_images_path: '/var/lib/libvirt/images'
|
||||||
@ -164,8 +164,8 @@ libvirt_domain_template_default: |
|
|||||||
</console>
|
</console>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if enable_vnc |bool %}
|
{% if enable_vnc |bool %}
|
||||||
<graphics type='vnc' autoport='yes' listen='127.0.0.1'>
|
<graphics type='vnc' autoport='yes' listen='0.0.0.0'>
|
||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='0.0.0.0'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<rng model="virtio"><backend model="random">/dev/urandom</backend></rng>
|
<rng model="virtio"><backend model="random">/dev/urandom</backend></rng>
|
||||||
|
@ -1,12 +1,11 @@
|
|||||||
---
|
---
|
||||||
- name: Ensure the VM console log directory exists
|
- name: Ensure the VM console log directory exists
|
||||||
file:
|
file:
|
||||||
path: "{{ libvirt_domain.console_log_path | dirname }}"
|
path: "{{ console_log_path | dirname}}"
|
||||||
state: directory
|
state: directory
|
||||||
owner: "{{ libvirt_domain.libvirt_vm_log_owner }}"
|
|
||||||
group: "{{ libvirt_domain.libvirt_vm_log_owner }}"
|
|
||||||
recurse: true
|
recurse: true
|
||||||
mode: 0770
|
mode: 0770
|
||||||
|
become: true
|
||||||
when: "libvirt_domain.console_log_enabled | default(false)"
|
when: "libvirt_domain.console_log_enabled | default(false)"
|
||||||
|
|
||||||
- name: Validate VM interfaces
|
- name: Validate VM interfaces
|
||||||
|
Loading…
x
Reference in New Issue
Block a user