Browse Source

Merge "use include_tasks instead of include"

Zuul 8 months ago
parent
commit
ef36df329d
2 changed files with 11 additions and 11 deletions
  1. 5
    5
      tasks/main.yml
  2. 6
    6
      tests/test.yml

+ 5
- 5
tasks/main.yml View File

@@ -39,15 +39,15 @@
39 39
   tags:
40 40
     - always
41 41
 
42
-- include: designate_pre_install.yml
42
+- include_tasks: designate_pre_install.yml
43 43
   tags:
44 44
     - designate-install
45 45
 
46
-- include: designate_install.yml
46
+- include_tasks: designate_install.yml
47 47
   tags:
48 48
     - designate-install
49 49
 
50
-- include: designate_post_install.yml
50
+- include_tasks: designate_post_install.yml
51 51
   tags:
52 52
     - designate-install
53 53
     - designate-config
@@ -103,12 +103,12 @@
103 103
 - name: Flush handlers
104 104
   meta: flush_handlers
105 105
 
106
-- include: designate_db_setup.yml
106
+- include_tasks: designate_db_setup.yml
107 107
   when: inventory_hostname == groups['designate_all'][0]
108 108
   tags:
109 109
     - designate-install
110 110
 
111
-- include: designate_service_setup.yml
111
+- include_tasks: designate_service_setup.yml
112 112
   when: inventory_hostname == groups['designate_all'][0]
113 113
   tags:
114 114
     - designate-install

+ 6
- 6
tests/test.yml View File

@@ -14,19 +14,19 @@
14 14
 # limitations under the License.
15 15
 
16 16
 # Setup the host
17
-- include: common/test-setup-host.yml
17
+- import_playbook: common/test-setup-host.yml
18 18
 
19 19
 # Prepare the containers
20
-- include: common/test-prepare-containers.yml
20
+- import_playbook: common/test-prepare-containers.yml
21 21
 
22 22
 # Install RabbitMQ/MariaDB
23
-- include: common/test-install-infra.yml
23
+- import_playbook: common/test-install-infra.yml
24 24
 
25 25
 # Install Keystone
26
-- include: common/test-install-keystone.yml
26
+- import_playbook: common/test-install-keystone.yml
27 27
 
28 28
 # Install Designate
29
-- include: test-install-designate.yml
29
+- import_playbook: test-install-designate.yml
30 30
 
31 31
 # Install and execute Tempest
32
-- include: common/test-install-tempest.yml
32
+- import_playbook: common/test-install-tempest.yml

Loading…
Cancel
Save