summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhijunWei <wzj334965317@outlook.com>2018-08-19 12:14:09 -0400
committerZhijunWei <wzj334965317@outlook.com>2018-08-19 12:17:12 -0400
commitead5ec8589abaefa8f3bdd17e03c6b470b4ed072 (patch)
treee7ad2b3abfe7e47646b6c280f94126caac54ba1a
parent3d486b25f98ed48215879b840855f3098a4a9f91 (diff)
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: I5b9e7be4c7212e3c483d2c65746629416cd309f2
Notes
Notes (review): Code-Review+1: jacky06 <zhang.min@99cloud.net> Code-Review+1: zhulingjie <easyzlj@gmail.com> Code-Review+2: Jesse Pretorius (odyssey4me) <jesse.pretorius@rackspace.co.uk> Code-Review+2: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk> Workflow+1: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 08 Sep 2018 21:02:23 +0000 Reviewed-on: https://review.openstack.org/593433 Project: openstack/openstack-ansible-repo_build Branch: refs/heads/master
-rw-r--r--tasks/main.yml12
-rw-r--r--tasks/repo_build_prepare.yml2
-rw-r--r--tests/test.yml6
3 files changed, 10 insertions, 10 deletions
diff --git a/tasks/main.yml b/tasks/main.yml
index 857be40..0428c3d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -24,11 +24,11 @@
24 tags: 24 tags:
25 - always 25 - always
26 26
27- include: repo_build_install.yml 27- include_tasks: repo_build_install.yml
28 tags: 28 tags:
29 - repo-build-install 29 - repo-build-install
30 30
31- include: repo_build_prepare.yml 31- include_tasks: repo_build_prepare.yml
32 tags: 32 tags:
33 - always 33 - always
34 34
@@ -39,20 +39,20 @@
39 tags: 39 tags:
40 - always 40 - always
41 41
42- include: repo_build_wheels.yml 42- include_tasks: repo_build_wheels.yml
43 when: 43 when:
44 - ansible_local['openstack_ansible']['repo_build']['need_wheel_build'] | bool 44 - ansible_local['openstack_ansible']['repo_build']['need_wheel_build'] | bool
45 tags: 45 tags:
46 - repo-build-wheels 46 - repo-build-wheels
47 47
48- include: repo_build_venvs.yml 48- include_tasks: repo_build_venvs.yml
49 tags: 49 tags:
50 - repo-build-venvs 50 - repo-build-venvs
51 51
52- include: repo_build_index.yml 52- include_tasks: repo_build_index.yml
53 tags: 53 tags:
54 - repo-build-index 54 - repo-build-index
55 55
56# Synchronize all built packages back to the repo master 56# Synchronize all built packages back to the repo master
57- include: repo_package_sync.yml 57- include_tasks: repo_package_sync.yml
58 when: inventory_hostname != groups['repo_all'][0] 58 when: inventory_hostname != groups['repo_all'][0]
diff --git a/tasks/repo_build_prepare.yml b/tasks/repo_build_prepare.yml
index 13299ef..175ea4f 100644
--- a/tasks/repo_build_prepare.yml
+++ b/tasks/repo_build_prepare.yml
@@ -44,7 +44,7 @@
44 dest: "{{ repo_build_release_path }}/requirements.txt" 44 dest: "{{ repo_build_release_path }}/requirements.txt"
45 register: _wheel_build_requirements 45 register: _wheel_build_requirements
46 46
47- include: repo_clone_git.yml 47- include_tasks: repo_clone_git.yml
48 when: 48 when:
49 - (repo_build_git_reclone | bool) or 49 - (repo_build_git_reclone | bool) or
50 (_wheel_build_requirements | changed) 50 (_wheel_build_requirements | changed)
diff --git a/tests/test.yml b/tests/test.yml
index ab2ab36..625d4ff 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -14,10 +14,10 @@
14# limitations under the License. 14# limitations under the License.
15 15
16# Prepare the host 16# Prepare the host
17- include: common/test-setup-host.yml 17- import_playbook: common/test-setup-host.yml
18 18
19# Install repo server 19# Install repo server
20- include: test-install-server.yml 20- import_playbook: test-install-server.yml
21 21
22# Build repo 22# Build repo
23- include: test-repo-build.yml 23- import_playbook: test-repo-build.yml