Browse Source

use include_tasks instead of include

include is marked as deprecated since ansible 2.4[0]

Switch to include_tasks or import_playbook as necessary

[0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated

Change-Id: Ie58b6b3ba46a1d6ff2d1ed855b7186a251323d2b
caoyuan 9 months ago
parent
commit
d39ef34a44
2 changed files with 20 additions and 20 deletions
  1. 6
    6
      tasks/main.yml
  2. 14
    14
      tests/test.yml

+ 6
- 6
tasks/main.yml View File

@@ -23,15 +23,15 @@
23 23
   tags:
24 24
     - always
25 25
 
26
-- include: magnum_pre_install.yml
26
+- include_tasks: magnum_pre_install.yml
27 27
   tags:
28 28
     - magnum-install
29 29
 
30
-- include: magnum_install.yml
30
+- include_tasks: magnum_install.yml
31 31
   tags:
32 32
     - magnum-install
33 33
 
34
-- include: magnum_post_install.yml
34
+- include_tasks: magnum_post_install.yml
35 35
   tags:
36 36
     - magnum-config
37 37
 
@@ -82,16 +82,16 @@
82 82
     - common-mq
83 83
     - magnum-config
84 84
 
85
-- include: magnum_db_setup.yml
85
+- include_tasks: magnum_db_setup.yml
86 86
   when: inventory_hostname == groups['magnum_all'][0]
87 87
   tags:
88 88
     - magnum-config
89 89
 
90
-- include: magnum_uwsgi.yml
90
+- include_tasks: magnum_uwsgi.yml
91 91
   tags:
92 92
     - magnum-config
93 93
 
94
-- include: magnum_service_setup.yml
94
+- include_tasks: magnum_service_setup.yml
95 95
   when: inventory_hostname == groups['magnum_all'][0]
96 96
   tags:
97 97
     - magnum-config

+ 14
- 14
tests/test.yml View File

@@ -15,43 +15,43 @@
15 15
 # limitations under the License.
16 16
 
17 17
 # Prepare the hosts
18
-- include: common/test-setup-host.yml
18
+- import_playbook: common/test-setup-host.yml
19 19
 
20 20
 # Install haproxy
21
-- include: test-install-haproxy.yml
21
+- import_playbook: test-install-haproxy.yml
22 22
 
23 23
 # Prepare the cinder-volumes VG
24
-- include: common/test-setup-cinder-localhost.yml
24
+- import_playbook: common/test-setup-cinder-localhost.yml
25 25
 
26 26
 # Install memcached
27
-- include: common/test-install-memcached.yml
27
+- import_playbook: common/test-install-memcached.yml
28 28
 
29 29
 # Install galera
30
-- include: common/test-install-galera.yml
30
+- import_playbook: common/test-install-galera.yml
31 31
 
32 32
 # Install rabbitmq
33
-- include: common/test-install-rabbitmq.yml
33
+- import_playbook: common/test-install-rabbitmq.yml
34 34
 
35 35
 # Install keystone
36
-- include: common/test-install-keystone.yml
36
+- import_playbook: common/test-install-keystone.yml
37 37
 
38 38
 # Install glance
39
-- include: common/test-install-glance.yml
39
+- import_playbook: common/test-install-glance.yml
40 40
 
41 41
 # Install cinder
42
-- include: common/test-install-cinder.yml
42
+- import_playbook: common/test-install-cinder.yml
43 43
 
44 44
 # Install nova
45
-- include: common/test-install-nova.yml
45
+- import_playbook: common/test-install-nova.yml
46 46
 
47 47
 # Install neutron
48
-- include: common/test-install-neutron.yml
48
+- import_playbook: common/test-install-neutron.yml
49 49
 
50 50
 # Install heat
51
-- include: common/test-install-heat.yml
51
+- import_playbook: common/test-install-heat.yml
52 52
 
53 53
 # Install magnum
54
-- include: test-install-magnum.yml
54
+- import_playbook: test-install-magnum.yml
55 55
 
56 56
 # Install and execute tempest
57
-- include: common/test-install-tempest.yml
57
+- import_playbook: common/test-install-tempest.yml

Loading…
Cancel
Save