From ee4831c65afd24640f915a97aa5864c313f9596b Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Wed, 21 Feb 2024 11:38:19 -0800 Subject: [PATCH] ansible: stop using deprecated include: Signed-off-by: Dan Mick --- .../roles/ansible-jenkins/tasks/jenkins.yml | 18 +++++++++--------- ansible/roles/ansible-jenkins/tasks/main.yml | 3 ++- .../roles/ceph-deploy-release/tasks/main.yml | 4 ++-- ansible/roles/grafana/tasks/main.yml | 4 ++-- ansible/roles/graphite/tasks/main.yml | 6 +++--- ansible/roles/kraken/tasks/main.yml | 2 +- ansible/roles/nginx/tasks/main.yml | 4 ++-- ansible/roles/remoto-release/tasks/main.yml | 4 ++-- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/ansible/roles/ansible-jenkins/tasks/jenkins.yml b/ansible/roles/ansible-jenkins/tasks/jenkins.yml index 9c49199e..371f4ed5 100644 --- 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 0fcf0b17..6d8011d4 100644 --- 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 f5bd70b3..8c10f863 100644 --- 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 b4e30752..b121e17f 100644 --- 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 f6f616f4..066ebdd1 100644 --- 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 9829b64f..a8f456be 100644 --- 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 42299172..6ba82e11 100644 --- 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 3f04ac87..06243f43 100644 --- 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) -- 2.39.5