summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-07 02:02:32 +0000
committerGerrit Code Review <review@openstack.org>2018-12-07 02:02:32 +0000
commit19a3156bdf768bb88ced435893fda436b86149a3 (patch)
tree636627693dc7f8afcdc709700e87dd6024e049ed
parente8796b218368a9ae991c977adb68bf93f1cbf377 (diff)
parent7b86d4cd34ee70c6b76c2b038ae5bcf3a73ddd62 (diff)
Merge "use include_tasks instead of include"
-rw-r--r--playbooks/integration/run.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/integration/run.yaml b/playbooks/integration/run.yaml
index 3649fc0..9efea80 100644
--- a/playbooks/integration/run.yaml
+++ b/playbooks/integration/run.yaml
@@ -4,13 +4,13 @@
4 OS_CLOUD: devstack-admin 4 OS_CLOUD: devstack-admin
5 5
6 tasks: 6 tasks:
7 - include: ssh-key.yaml 7 - include_tasks: ssh-key.yaml
8 8
9 - include: cirros-image.yaml 9 - include_tasks: cirros-image.yaml
10 when: metalsmith_whole_disk_image is not defined 10 when: metalsmith_whole_disk_image is not defined
11 11
12 - name: Test a whole-disk image 12 - name: Test a whole-disk image
13 include: exercise.yaml 13 include_tasks: exercise.yaml
14 vars: 14 vars:
15 metalsmith_image: "{{ metalsmith_whole_disk_image }}" 15 metalsmith_image: "{{ metalsmith_whole_disk_image }}"
16 metalsmith_image_checksum: "{{ metalsmith_whole_disk_checksum | default('') }}" 16 metalsmith_image_checksum: "{{ metalsmith_whole_disk_checksum | default('') }}"
@@ -18,7 +18,7 @@
18 metalsmith_swap_size: 18 metalsmith_swap_size:
19 19
20 - name: Test a partition image 20 - name: Test a partition image
21 include: exercise.yaml 21 include_tasks: exercise.yaml
22 vars: 22 vars:
23 metalsmith_image: "{{ metalsmith_partition_image }}" 23 metalsmith_image: "{{ metalsmith_partition_image }}"
24 metalsmith_image_checksum: "{{ metalsmith_partition_checksum | default('') }}" 24 metalsmith_image_checksum: "{{ metalsmith_partition_checksum | default('') }}"