openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Use dynamic include for conditional/tagged tasks"

This commit is contained in:
Jenkins 2017-05-22 10:44:49 +00:00 committed by Gerrit Code Review
parent 15504de6c0 cb640cbe1d
commit b553b7d0d9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,20 +41,24 @@
# Conditionally include a playbook for all the images specified
# in options that updates images to the latest delorean version
- include: inject_repos.yml
static: no
when: devmode|bool
# inject the gating repo generated by ansible-role-tripleo-gate
- include: inject_gating_repo.yml
static: no
when: compressed_gating_repo is defined
# Converts an overcloud-full.qcow2 into a undercloud.qcow2
- include: convert_image.yml
static: no
when: overcloud_as_undercloud|bool or baseos_as_undercloud|bool
# Update images after we have converted the overcloud-full to an
# undercloud image when using devmode. This also clones tripleo-ci
# on the undercloud image.
- include: update_image.yml
static: no
when: devmode|bool
# Inject updated overcloud and ipa images into our converted undercloud
@ -140,6 +144,7 @@
# overcloud image, to cover any extra needs.
- name: Perform extra overcloud customizations
include: customize_overcloud.yml
static: no
when: overcloud_customize_script is defined
# Perform an SELinux relabel on the undercloud image to avoid problems

1
roles/tripleo-inventory/tests/playbooks/quickstart-usb.yml
View File

@ -4,6 +4,7 @@
# creating an inventory entry for our `virthost` and for creating an
# unprivileged user on that host for use by our virtual environment.
- include: provision.yml
static: no
tags:
- provision