summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-17 04:54:28 +0000
committerGerrit Code Review <review@openstack.org>2018-08-17 04:54:28 +0000
commitd8c4bf7f690fb7815afeb9619bcf8a9ae69f77f7 (patch)
tree992332949ad75d3c1987bfdf1687f3e7d96a0158
parent6a0db284d5ad6cd49c829d95bb466699fa71509b (diff)
parent3cd7fbdc284eade168c463cb054853fe874a0123 (diff)
Merge "use include_tasks instead of include"
-rw-r--r--tasks/main.yml6
-rw-r--r--tests/test.yml10
2 files changed, 8 insertions, 8 deletions
diff --git a/tasks/main.yml b/tasks/main.yml
index 8d8045f..db3d391 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -24,15 +24,15 @@
24 tags: 24 tags:
25 - always 25 - always
26 26
27- include: almanach_pre_install.yml 27- include_tasks: almanach_pre_install.yml
28 tags: 28 tags:
29 - almanach-install 29 - almanach-install
30 30
31- include: almanach_install.yml 31- include_tasks: almanach_install.yml
32 tags: 32 tags:
33 - almanach-install 33 - almanach-install
34 34
35- include: almanach_post_install.yml 35- include_tasks: almanach_post_install.yml
36 tags: 36 tags:
37 - almanach-install 37 - almanach-install
38 - almanach-config 38 - almanach-config
diff --git a/tests/test.yml b/tests/test.yml
index 08916a0..a725e24 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -14,16 +14,16 @@
14# limitations under the License. 14# limitations under the License.
15 15
16# Setup the host 16# Setup the host
17- include: common/test-setup-host.yml 17- import_playbook: common/test-setup-host.yml
18 18
19# Install RabbitMQ/MariaDB 19# Install RabbitMQ/MariaDB
20- include: common/test-install-infra.yml 20- import_playbook: common/test-install-infra.yml
21 21
22# Install MongoDB 22# Install MongoDB
23- include: test-install-mongodb.yml 23- import_playbook: test-install-mongodb.yml
24 24
25# Install Almanach 25# Install Almanach
26- include: test-install-almanach.yml 26- import_playbook: test-install-almanach.yml
27 27
28# Test Almanach 28# Test Almanach
29- include: test-functional-almanach.yml 29- import_playbook: test-functional-almanach.yml