Instack.json for undercloud VM image

Do not try to copy the instackenv.json configuration
file to the undercloud VM image, if it wasn't generated
in the overcloud setup role.

This may be the case if there are no overcloud nodes
defined and the overcloud setup role is missing in
the play, f.e. the containerized undercloud use case.

Partial-bug: #1676373
Change-Id: I7a5a564aacdfa2153ad727baf0b5259cb723ec69
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2017-03-21 22:47:27 +01:00
parent 1415164248
commit 34bd210a55
2 changed files with 1 additions and 1 deletions

View File

@ -115,4 +115,3 @@
template:
src: "{{ undercloud_instackenv_template }}"
dest: "{{ working_dir }}/instackenv.json"

View File

@ -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.