Merge "Generate/inject instack.json if overcloud nodes"

roles/libvirt/setup/overcloud/tasks/main.yml

@@ -107,12 +107,7 @@
         - "{{ overcloud_nodes }}"
         - "{{ extradisks_list }}"
 
-# Generate the `instackenv.json` configuration file.  Note that this
-# task *must* occur after the above overcloud tasks, because if
-# `overcloud_nodes` is defined the template depends on the
-# `node_mac_map` variable.
-- name: Write instackenv script
-  template:
-    src: "{{ undercloud_instackenv_template }}"
-    dest: "{{ working_dir }}/instackenv.json"
-
+    - name: Write instackenv script
+      template:
+        src: "{{ undercloud_instackenv_template }}"
+        dest: "{{ working_dir }}/instackenv.json"

roles/libvirt/setup/undercloud/tasks/main.yml

@@ -78,6 +78,7 @@
     environment:
       LIBGUESTFS_BACKEND: direct
       LIBVIRT_DEFAULT_URI: "{{ libvirt_uri }}"
+    when: overcloud_nodes
 
   # Copy the undercloud public key to the virthost, because we're going
   # to inject it into the undercloud image in the next task.