From b929678ff136f6f8ad27af04548a89f594627936 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 6 Jan 2014 18:22:18 +0000 Subject: [PATCH] Hard code vars_path for now. --- playbooks/cloud_prep.yml | 2 +- playbooks/el6_temp_instance.yml | 2 +- playbooks/f19_temp_instance.yml | 2 +- playbooks/fedora_temp_instance.yml | 2 +- playbooks/groups/arm-packager.yml | 2 +- playbooks/groups/arm-qa.yml | 2 +- playbooks/groups/arm-releng.yml | 2 +- playbooks/groups/backup-server.yml | 2 +- playbooks/groups/badges-backend.yml | 4 ++-- playbooks/groups/badges-web.yml | 4 ++-- playbooks/groups/beaker.yml | 4 ++-- playbooks/groups/bkernel.yml | 2 +- playbooks/groups/buildhw.yml | 4 ++-- playbooks/groups/buildvm.yml | 4 ++-- playbooks/groups/docs-backend.yml | 4 ++-- playbooks/groups/fedocal.yml | 4 ++-- playbooks/groups/gallery.yml | 6 +++--- playbooks/groups/jenkins-cloud.yml | 4 ++-- playbooks/groups/kernel-qa.yml | 6 +----- playbooks/groups/keyserver.yml | 4 ++-- playbooks/groups/koji-hub.yml | 4 ++-- playbooks/groups/mailman.yml | 8 ++++---- playbooks/groups/mirrorlist.yml | 4 ++-- playbooks/groups/notifs-backend.yml | 6 +++--- playbooks/groups/notifs-web.yml | 4 ++-- playbooks/groups/nuancier.yml | 6 +++--- playbooks/groups/postgresl-server.yml | 6 +++--- playbooks/groups/releng.yml | 4 ++-- playbooks/groups/sign.yml | 2 +- playbooks/groups/taskbot.yml | 4 ++-- playbooks/groups/virthost.yml | 2 +- playbooks/hosts/artboard.cloud.fedoraproject.org.yml | 2 +- .../hosts/blockerbugs-dev.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/copr-be.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/fedocal.dev.fedoraproject.org.yml | 2 +- playbooks/hosts/hrf.cloud.fedoraproject.org.yml | 4 ++-- playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml | 2 +- playbooks/restart_unbound.yml | 2 +- playbooks/set_root_auth_keys.yml | 2 +- playbooks/transient_post_provision.yml | 2 +- playbooks/vhost_reboot.yml | 2 +- 47 files changed, 73 insertions(+), 77 deletions(-) diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index bebccc01d4..6bf0213d81 100644 --- a/playbooks/cloud_prep.yml +++ b/playbooks/cloud_prep.yml @@ -4,7 +4,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/el6_temp_instance.yml b/playbooks/el6_temp_instance.yml index a8f006c4b0..eed219989e 100644 --- a/playbooks/el6_temp_instance.yml +++ b/playbooks/el6_temp_instance.yml @@ -27,7 +27,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/growroot_cloud.yml" diff --git a/playbooks/f19_temp_instance.yml b/playbooks/f19_temp_instance.yml index cbc7e261bf..1c7f0196aa 100644 --- a/playbooks/f19_temp_instance.yml +++ b/playbooks/f19_temp_instance.yml @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - name: growpart /dev/vda1 partition (/) to full size diff --git a/playbooks/fedora_temp_instance.yml b/playbooks/fedora_temp_instance.yml index fba938c06b..5197e9c1b5 100644 --- a/playbooks/fedora_temp_instance.yml +++ b/playbooks/fedora_temp_instance.yml @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/growroot_cloud.yml" diff --git a/playbooks/groups/arm-packager.yml b/playbooks/groups/arm-packager.yml index 3786f51263..4d44c54b75 100644 --- a/playbooks/groups/arm-packager.yml +++ b/playbooks/groups/arm-packager.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index 92790c7369..4193d22a47 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/arm-releng.yml b/playbooks/groups/arm-releng.yml index 686c6e201c..85ea2804ff 100644 --- a/playbooks/groups/arm-releng.yml +++ b/playbooks/groups/arm-releng.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index e19345e310..8d9b30ee72 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 2ba35f7140..db6c80fafe 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 86be68733c..737dcbbb74 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 954c34fd9b..8f55210b19 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/bkernel.yml b/playbooks/groups/bkernel.yml index 30344531a9..bad914e36c 100644 --- a/playbooks/groups/bkernel.yml +++ b/playbooks/groups/bkernel.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 3b860944df..0dc109d973 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base @@ -36,7 +36,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 41e43d45fb..aa3191e0d5 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index 5db4448c5e..f0cb73d20e 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -6,7 +6,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -22,7 +22,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index b9c06e9084..91ffcf861e 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index 16948be5b8..d41f03c520 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base @@ -59,7 +59,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/gallery diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml index 04e699b8b1..2a70881f03 100644 --- a/playbooks/groups/jenkins-cloud.yml +++ b/playbooks/groups/jenkins-cloud.yml @@ -23,7 +23,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml vars: - resolvconf: resolv.conf/jenkins-cloud @@ -168,7 +168,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/groups/kernel-qa.yml b/playbooks/groups/kernel-qa.yml index 78ae1b2fa5..aadf88aba9 100644 --- a/playbooks/groups/kernel-qa.yml +++ b/playbooks/groups/kernel-qa.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base @@ -30,7 +30,3 @@ handlers: - include: "{{ handlers }}/restart_services.yml" - - - - diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 319c8650ff..ec57825d4b 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 490348d120..425f374cd2 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -28,7 +28,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index acb021e038..74582c2d93 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base @@ -63,7 +63,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: # mailman auto-updates its schema, there can only be one admin user @@ -94,7 +94,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/mailman diff --git a/playbooks/groups/mirrorlist.yml b/playbooks/groups/mirrorlist.yml index 400cd534e3..c389d92f20 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 3a2499050b..4d2dac3e2d 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base @@ -64,4 +64,4 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 376e1d0ead..01458e3038 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 9b2efa086d..5a86f0673b 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base @@ -61,7 +61,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/fedmsg_base diff --git a/playbooks/groups/postgresl-server.yml b/playbooks/groups/postgresl-server.yml index 6b652a77dc..95ceec4b06 100644 --- a/playbooks/groups/postgresl-server.yml +++ b/playbooks/groups/postgresl-server.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -28,7 +28,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base @@ -55,7 +55,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/koji_db diff --git a/playbooks/groups/releng.yml b/playbooks/groups/releng.yml index 318ab76dfb..9773c70560 100644 --- a/playbooks/groups/releng.yml +++ b/playbooks/groups/releng.yml @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -31,7 +31,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/sign.yml b/playbooks/groups/sign.yml index 458c7d1d79..d696be8f6b 100644 --- a/playbooks/groups/sign.yml +++ b/playbooks/groups/sign.yml @@ -14,7 +14,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/taskbot.yml b/playbooks/groups/taskbot.yml index 6135ec2a87..1673243e4c 100644 --- a/playbooks/groups/taskbot.yml +++ b/playbooks/groups/taskbot.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 6bbad55496..08c2b71411 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/hosts/artboard.cloud.fedoraproject.org.yml b/playbooks/hosts/artboard.cloud.fedoraproject.org.yml index cc180db01d..0b5c63020c 100644 --- a/playbooks/hosts/artboard.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/artboard.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml index 3e23af1796..4ccca843f6 100644 --- a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml @@ -22,7 +22,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml index ca33ea5737..ba27c343f1 100644 --- a/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml index 02ab39ad04..712cf58026 100644 --- a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # Roles are run first, before tasks, regardless of where you place them here. roles: diff --git a/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml index 956ca807f1..22cdf424ba 100644 --- a/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml index 82b98f579c..014574b5da 100644 --- a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml index de112dfb1a..b5b1744143 100644 --- a/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/fedocal.dev.fedoraproject.org.yml b/playbooks/hosts/fedocal.dev.fedoraproject.org.yml index 36e6b2deef..4791ff8330 100644 --- a/playbooks/hosts/fedocal.dev.fedoraproject.org.yml +++ b/playbooks/hosts/fedocal.dev.fedoraproject.org.yml @@ -22,7 +22,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/hrf.cloud.fedoraproject.org.yml b/playbooks/hosts/hrf.cloud.fedoraproject.org.yml index 535a43902c..d34ba13be7 100644 --- a/playbooks/hosts/hrf.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/hrf.cloud.fedoraproject.org.yml @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" @@ -34,7 +34,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - name: install deps diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index d60d38cce5..8b5744839a 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml vars: - mailman_vardir: /srv/persist/mailman diff --git a/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml index bc961aeea9..914b922439 100644 --- a/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml index 1423b281b0..6fd9f51696 100644 --- a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/restart_unbound.yml b/playbooks/restart_unbound.yml index be8fbe0e48..1366d71e7f 100644 --- a/playbooks/restart_unbound.yml +++ b/playbooks/restart_unbound.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/restart_unbound.yml" diff --git a/playbooks/set_root_auth_keys.yml b/playbooks/set_root_auth_keys.yml index eb3a120d32..e21c1255a4 100644 --- a/playbooks/set_root_auth_keys.yml +++ b/playbooks/set_root_auth_keys.yml @@ -7,7 +7,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml vars: - root_auth_users: '' diff --git a/playbooks/transient_post_provision.yml b/playbooks/transient_post_provision.yml index 8893be1f64..e80e50d0f0 100644 --- a/playbooks/transient_post_provision.yml +++ b/playbooks/transient_post_provision.yml @@ -15,7 +15,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/growroot_cloud.yml" diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index fa857b702f..4f3d8191cf 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -104,7 +104,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ vars_path }}/{{ ansible_distribution }}.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - include: "{{ tasks }}/restart_unbound.yml"