ansible: stop using deprecated include:

Signed-off-by: Dan Mick <dmick@redhat.com>

diff --git a/ansible/roles/ansible-jenkins/tasks/jenkins.yml b/ansible/roles/ansible-jenkins/tasks/jenkins.yml
index 9c49199e5d4626c5072e92bea48638831626cc3b..371f4ed5242922816be487aec6deebcd45cb346b 100644 (file)
--- a/ansible/roles/ansible-jenkins/tasks/jenkins.yml
+++ b/ansible/roles/ansible-jenkins/tasks/jenkins.yml
@@ -1,15 +1,15 @@
 ---
-- include: repo.yml
+- include_tasks: repo.yml
 
-- include: dependencies.yml
+- include_tasks: dependencies.yml
 
-- include: nginx.yml
+- include_tasks: nginx.yml
 
-- include: letsencrypt.yml
+- include_tasks: letsencrypt.yml
   tags:
     - letsencrypt
 
-- include: ufw.yml
+- include_tasks: ufw.yml
   tags:
     - ufw
 
@@ -19,18 +19,18 @@
     state: present
   register: jenkins_install
 
-- include: config.yml
+- include_tasks: config.yml
 
-- include: plugins.yml
+- include_tasks: plugins.yml
   when: okay_with_restart == "y"
   tags:
     - plugins
 
 # This should only get run the first time the role is run.
 # The variables should be passed as --extra-vars via ansible-playbook command
-- include: auth.yml
+- include_tasks: auth.yml
   when: github_oauth_client is defined and github_oauth_secret is defined
   tags:
     - auth
 
-- include: config.yml
+- include_tasks: config.yml

diff --git a/ansible/roles/ansible-jenkins/tasks/main.yml b/ansible/roles/ansible-jenkins/tasks/main.yml
index 0fcf0b170cb9577a67f52bad6cb4991995962dbc..6d8011d4a26ab17d179422bdaa1cd2bcedaecdaf 100644 (file)
--- a/ansible/roles/ansible-jenkins/tasks/main.yml
+++ b/ansible/roles/ansible-jenkins/tasks/main.yml
@@ -1,2 +1,3 @@
 ---
-- include: jenkins.yml tags=jenkins
+- include_tasks: jenkins.yml
+  tags: jenkins

diff --git a/ansible/roles/ceph-deploy-release/tasks/main.yml b/ansible/roles/ceph-deploy-release/tasks/main.yml
index f5bd70b33d24c07b2b857cdceb101292a1accfe8..8c10f863f08b85af16e8ea94a9428d166628a98f 100644 (file)
--- a/ansible/roles/ceph-deploy-release/tasks/main.yml
+++ b/ansible/roles/ceph-deploy-release/tasks/main.yml
@@ -25,11 +25,11 @@
   # we probably messed up the previous commit+tag, so we chose to use 'clean'
   # that will rollback that commit, delete the local and remote tag, and force
   # push the new changes
-- include: clear_version.yml
+- include_tasks: clear_version.yml
   when: (clean and last_commit.stdout == tag_name)
 
   # if the last commit wasn't one that we already did, then go ahead and make
   # the changes + tag for the release. Otherwise, just skip because it was
   # already done for this release
-- include: release.yml
+- include_tasks: release.yml
   when: (tag_name != last_commit.stdout)

diff --git a/ansible/roles/grafana/tasks/main.yml b/ansible/roles/grafana/tasks/main.yml
index b4e307524fc18009ac58860913b6ec80ed20ca51..b121e17f9dec645f4d80c23f803bb6e9a62128c4 100644 (file)
--- a/ansible/roles/grafana/tasks/main.yml
+++ b/ansible/roles/grafana/tasks/main.yml
@@ -40,11 +40,11 @@
     - restart app
   become: true
 
-- include: postgresql.yml
+- include_tasks: postgresql.yml
   tags:
     - postgresql
 
-- include: nginx.yml
+- include_tasks: nginx.yml
 
 - name: ensure nginx is running
   become: true

diff --git a/ansible/roles/graphite/tasks/main.yml b/ansible/roles/graphite/tasks/main.yml
index f6f616f46c7b0296f55e846944da1c11c6b7ca34..066ebdd1bec8b81d2055cfd0c21bc217de321966 100644 (file)
--- a/ansible/roles/graphite/tasks/main.yml
+++ b/ansible/roles/graphite/tasks/main.yml
@@ -40,13 +40,13 @@
     creates: "/usr/lib/python2.7/dist-packages/graphite/graphite_web.py"
   become: true
 
-- include: carbon.yml
+- include_tasks: carbon.yml
 
-- include: systemd.yml
+- include_tasks: systemd.yml
   tags:
     - systemd
 
-- include: postgresql.yml
+- include_tasks: postgresql.yml
   tags:
     - postgresql
 

diff --git a/ansible/roles/kraken/tasks/main.yml b/ansible/roles/kraken/tasks/main.yml
index 9829b64fabe84253ce8f3dc2d7e0022969bc0ff7..a8f456be25b3cd68febc0ae980d5cc133c875ada 100644 (file)
--- a/ansible/roles/kraken/tasks/main.yml
+++ b/ansible/roles/kraken/tasks/main.yml
@@ -100,4 +100,4 @@
     name: mongod
     enabled: true
 
-- include: systemd.yml
+- include_tasks: systemd.yml

diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
index 422991729fd72cc77c1e38ea01c204ad81a8ff3e..6ba82e114a69b4e8675af0dec4b93cf45739de63 100644 (file)
--- a/ansible/roles/nginx/tasks/main.yml
+++ b/ansible/roles/nginx/tasks/main.yml
@@ -44,10 +44,10 @@
   notify:
     - restart nginx
 
-- include: ssl.yml
+- include_tasks: ssl.yml
   when: development_server == true
 
-- include: letsencrypt.yml
+- include_tasks: letsencrypt.yml
   when: development_server == false
 
 - name: link nginx config

diff --git a/ansible/roles/remoto-release/tasks/main.yml b/ansible/roles/remoto-release/tasks/main.yml
index 3f04ac87b82efc43efee53187280bc7937ec07f5..06243f435bc71566715e552b041db4c73b400c44 100644 (file)
--- a/ansible/roles/remoto-release/tasks/main.yml
+++ b/ansible/roles/remoto-release/tasks/main.yml
@@ -25,11 +25,11 @@
   # we probably messed up the previous commit+tag, so we chose to use 'clean'
   # that will rollback that commit, delete the local and remote tag, and force
   # push the new changes
-- include: clear_version.yml
+- include_tasks: clear_version.yml
   when: (clean and last_commit.stdout == tag_name)
 
   # if the last commit wasn't one that we already did, then go ahead and make
   # the changes + tag for the release. Otherwise, just skip because it was
   # already done for this release
-- include: release.yml
+- include_tasks: release.yml
   when: (tag_name != last_commit.stdout)