openstack
/
tripleo-quickstart
Code Issues Proposed changes

Control injection of instackenv.json 

Allow users to control if instackenv.json must be injected
for undercloud image or omitted. The latter may be the case
when installing only a virtual undercloud node w/o overcloud
nodes at all.

Related-bug: #1676373

Change-Id: Iac245daceab01302e7e4cb75458901a0c0af47df
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Bogdan Dobrelya 2017-04-26 16:25:06 +02:00
parent be4e973a2c
commit 0960fbaa28
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/libvirt/defaults/main.yml
View File

@ -34,7 +34,11 @@ libvirt_arch: x86_64
# address before giving up. # address before giving up.
undercloud_ip_retries: 20 undercloud_ip_retries: 20
# controls either to inject instackenv.json or omit it, which may be the case
# for virtual undercloud deployments w/o overcloud nodes (neither virtual,
# nor BM, nor OVB hosted).
undercloud_instackenv_template: instackenv.json.j2 undercloud_instackenv_template: instackenv.json.j2
inject_instackenv: true
# set to true if you want to inject additional overcloud # set to true if you want to inject additional overcloud
# and ipa images. You will need to define the images and # and ipa images. You will need to define the images and

2
roles/libvirt/setup/undercloud/tasks/main.yml
View File

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