From 493796b94ce389aa37c6c1386ec7c80d15ce6731 Mon Sep 17 00:00:00 2001
From: Kostiantyn Kalynovskyi <kkalynovskyi@mirantis.com>
Date: Mon, 27 Jan 2020 18:57:13 +0000
Subject: [PATCH] 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
---
 roles/airship-libvirt-gate/defaults/main.yml     | 4 ----
 roles/airship-libvirt-gate/tasks/build-infra.yml | 2 ++
 roles/libvirt-domain/defaults/main.yml           | 6 +++---
 roles/libvirt-domain/tasks/domain.yml            | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/roles/airship-libvirt-gate/defaults/main.yml b/roles/airship-libvirt-gate/defaults/main.yml
index e597dc9..7070145 100644
--- a/roles/airship-libvirt-gate/defaults/main.yml
+++ b/roles/airship-libvirt-gate/defaults/main.yml
@@ -69,10 +69,6 @@ airship_gate_libvirt_networks:
       ip:
         address: "{{ airship_gate_ipam.nat_network.bridge_ip }}"
         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
     autostart: false
     name: "{{ airship_gate_names.provision_network }}"
diff --git a/roles/airship-libvirt-gate/tasks/build-infra.yml b/roles/airship-libvirt-gate/tasks/build-infra.yml
index dba094d..f4a0faa 100644
--- a/roles/airship-libvirt-gate/tasks/build-infra.yml
+++ b/roles/airship-libvirt-gate/tasks/build-infra.yml
@@ -75,6 +75,8 @@
     name: libvirt-domain
   vars:
     libvirt_domain:
+      enable_vnc: true
+      console_log_enabled: true
       state: shutdown
       name: "{{ airship_gate_names.ephemeral_vm }}"
       memory_mb: "{{ chosen_flavor.ephemeral_vm_memory_mb }}"
diff --git a/roles/libvirt-domain/defaults/main.yml b/roles/libvirt-domain/defaults/main.yml
index 8141f1e..e9f20b2 100644
--- a/roles/libvirt-domain/defaults/main.yml
+++ b/roles/libvirt-domain/defaults/main.yml
@@ -2,7 +2,7 @@
 
 # The default directory in which to store VM console logs, if a VM-specific log
 # 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
 libvirt_volume_default_images_path: '/var/lib/libvirt/images'
@@ -164,8 +164,8 @@ libvirt_domain_template_default: |
       </console>
       {% endif %}
       {% if enable_vnc |bool %}
-      <graphics type='vnc' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
+      <graphics type='vnc' autoport='yes' listen='0.0.0.0'>
+      <listen type='address' address='0.0.0.0'/>
       </graphics>
       {% endif %}
       <rng model="virtio"><backend model="random">/dev/urandom</backend></rng>
diff --git a/roles/libvirt-domain/tasks/domain.yml b/roles/libvirt-domain/tasks/domain.yml
index 4e3d078..79e55ed 100644
--- a/roles/libvirt-domain/tasks/domain.yml
+++ b/roles/libvirt-domain/tasks/domain.yml
@@ -1,12 +1,11 @@
 ---
 - name: Ensure the VM console log directory exists
   file:
-    path: "{{ libvirt_domain.console_log_path | dirname }}"
+    path: "{{ console_log_path | dirname}}"
     state: directory
-    owner: "{{ libvirt_domain.libvirt_vm_log_owner }}"
-    group: "{{ libvirt_domain.libvirt_vm_log_owner }}"
     recurse: true
     mode: 0770
+  become: true
   when: "libvirt_domain.console_log_enabled | default(false)"
 
 - name: Validate VM interfaces