From d64ab29c0e03e27d85bc26d4258b5bafb4dffb80 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 9 Jan 2015 22:59:18 +0000 Subject: [PATCH] New ansible doesn't like expanding {{ private }} in the same list of vars files it's defined in. --- playbooks/cloud_prep.yml | 2 +- playbooks/el6_temp_instance.yml | 4 ++-- playbooks/el7_temp_instance.yml | 4 ++-- playbooks/f19_temp_instance.yml | 4 ++-- playbooks/f20_temp_instance.yml | 4 ++-- playbooks/fedora_temp_instance.yml | 4 ++-- playbooks/groups/anitya.yml | 8 ++++---- playbooks/groups/arm-packager.yml | 2 +- playbooks/groups/arm-qa.yml | 2 +- playbooks/groups/ask.yml | 4 ++-- playbooks/groups/atomic.yml | 2 +- playbooks/groups/autosign.yml | 4 ++-- playbooks/groups/backup-server.yml | 2 +- playbooks/groups/badges-backend.yml | 6 +++--- playbooks/groups/badges-web.yml | 4 ++-- playbooks/groups/bastion.yml | 4 ++-- playbooks/groups/beaker.yml | 4 ++-- playbooks/groups/bodhi.yml | 4 ++-- playbooks/groups/bugzilla2fedmsg.yml | 6 +++--- playbooks/groups/buildhw.yml | 2 +- playbooks/groups/buildvm.yml | 4 ++-- playbooks/groups/busgateway.yml | 6 +++--- playbooks/groups/composers.yml | 6 +++--- playbooks/groups/copr-backend.yml | 6 +++--- playbooks/groups/copr-frontend.yml | 6 +++--- playbooks/groups/copr-keygen.yml | 6 +++--- playbooks/groups/datagrepper.yml | 10 +++++----- playbooks/groups/dhcp.yml | 4 ++-- playbooks/groups/dns.yml | 4 ++-- playbooks/groups/docs-backend.yml | 6 +++--- playbooks/groups/download.yml | 6 +++--- playbooks/groups/elections.yml | 8 ++++---- playbooks/groups/fas.yml | 4 ++-- playbooks/groups/fedimg.yml | 6 +++--- playbooks/groups/fedoauth.yml | 6 +++--- playbooks/groups/fedocal.yml | 8 ++++---- playbooks/groups/gallery.yml | 6 +++--- playbooks/groups/github2fedmsg.yml | 6 +++--- playbooks/groups/hotness.yml | 8 ++++---- playbooks/groups/jenkins-cloud.yml | 10 +++++----- playbooks/groups/kerneltest.yml | 6 +++--- playbooks/groups/keyserver.yml | 4 ++-- playbooks/groups/koji-hub.yml | 4 ++-- playbooks/groups/lockbox.yml | 6 +++--- playbooks/groups/mailman.yml | 8 ++++---- playbooks/groups/memcached.yml | 4 ++-- playbooks/groups/mirrorlist.yml | 4 ++-- playbooks/groups/mirrormanager.yml | 10 +++++----- playbooks/groups/noc.yml | 6 +++--- playbooks/groups/notifs-backend.yml | 6 +++--- playbooks/groups/notifs-web.yml | 4 ++-- playbooks/groups/nuancier.yml | 12 ++++++------ playbooks/groups/packages.yml | 10 +++++----- playbooks/groups/paste.yml | 4 ++-- playbooks/groups/people.yml | 6 +++--- playbooks/groups/pkgdb.yml | 8 ++++---- playbooks/groups/pkgs.yml | 6 +++--- playbooks/groups/postgresql-server.yml | 4 ++-- playbooks/groups/proxies-certificates.yml | 2 +- playbooks/groups/proxies-fedora-web.yml | 2 +- playbooks/groups/proxies-haproxy.yml | 2 +- playbooks/groups/proxies-miscellaneous.yml | 2 +- playbooks/groups/proxies-redirects.yml | 2 +- playbooks/groups/proxies-reverseproxy.yml | 2 +- playbooks/groups/proxies-rewrites.yml | 2 +- playbooks/groups/proxies-websites.yml | 2 +- playbooks/groups/proxies.yml | 8 ++++---- playbooks/groups/qadevel-stg.yml | 6 +++--- playbooks/groups/qadevel.yml | 8 ++++---- playbooks/groups/releng-compose.yml | 4 ++-- playbooks/groups/resultsdb-dev.yml | 6 +++--- playbooks/groups/resultsdb-prod.yml | 6 +++--- playbooks/groups/resultsdb-stg.yml | 4 ++-- playbooks/groups/retrace.yml | 2 +- playbooks/groups/smtp-mm.yml | 4 ++-- playbooks/groups/summershum.yml | 8 ++++---- playbooks/groups/sundries.yml | 4 ++-- playbooks/groups/tagger.yml | 8 ++++---- playbooks/groups/taskotron-dev-clients.yml | 6 +++--- playbooks/groups/taskotron-dev.yml | 8 ++++---- playbooks/groups/taskotron-prod-clients.yml | 6 +++--- playbooks/groups/taskotron-prod.yml | 6 +++--- playbooks/groups/taskotron-stg-clients.yml | 6 +++--- playbooks/groups/taskotron-stg.yml | 6 +++--- playbooks/groups/unbound.yml | 4 ++-- playbooks/groups/value.yml | 4 ++-- playbooks/groups/virthost.yml | 2 +- playbooks/groups/wiki.yml | 4 ++-- playbooks/hosts/209.132.184.148.yml | 4 ++-- playbooks/hosts/artboard.cloud.fedoraproject.org.yml | 4 ++-- .../blockerbugs-dev.cloud.fedoraproject.org.yml | 4 ++-- playbooks/hosts/bodhi.dev.fedoraproject.org.yml | 4 ++-- .../hosts/cloud-noc01.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/devpi.cloud.fedoraproject.org.yml | 4 ++-- .../hosts/elections-dev.cloud.fedoraproject.org.yml | 4 ++-- .../hosts/fed-cloud10.cloud.fedoraproject.org.yml | 2 +- .../hosts/fed-cloud11.cloud.fedoraproject.org.yml | 2 +- playbooks/hosts/fedocal.dev.fedoraproject.org.yml | 4 ++-- playbooks/hosts/hrf.cloud.fedoraproject.org.yml | 6 +++--- playbooks/hosts/junk02.phx2.fedoraproject.org.yml | 2 +- playbooks/hosts/koschei.cloud.fedoraproject.org.yml | 6 +++--- .../hosts/lists-dev.cloud.fedoraproject.org.yml | 8 ++++---- playbooks/hosts/logserver.yml | 4 ++-- .../hosts/logstash-dev.cloud.fedoraproject.org.yml | 4 ++-- .../hosts/shogun-ca.cloud.fedoraproject.org.yml | 4 ++-- playbooks/manual/kernel-qa.yml | 2 +- playbooks/manual/push-badges.yml | 6 +++--- playbooks/manual/qadevel.yml | 4 ++-- playbooks/manual/restart-fedmsg-services.yml | 10 +++++----- playbooks/manual/sign-bridge.yml | 4 ++-- playbooks/manual/sign-vault.yml | 2 +- playbooks/set_root_auth_keys.yml | 2 +- playbooks/transient_post_provision.yml | 2 +- playbooks/update-proxy-dns.yml | 2 +- 114 files changed, 276 insertions(+), 276 deletions(-) diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index 6bf0213d81..e592087852 100644 --- a/playbooks/cloud_prep.yml +++ b/playbooks/cloud_prep.yml @@ -3,7 +3,7 @@ user: root vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/el6_temp_instance.yml b/playbooks/el6_temp_instance.yml index 6b1a4d1c2f..1b542eacbc 100644 --- a/playbooks/el6_temp_instance.yml +++ b/playbooks/el6_temp_instance.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" vars: - keypair: fedora-admin-20130801 @@ -28,7 +28,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/el7_temp_instance.yml b/playbooks/el7_temp_instance.yml index 17aa36cf4b..fabc1048d4 100644 --- a/playbooks/el7_temp_instance.yml +++ b/playbooks/el7_temp_instance.yml @@ -8,7 +8,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" vars: - keypair: fedora-admin-20130801 - image: "{{ el7_qcow_id }}" @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/f19_temp_instance.yml b/playbooks/f19_temp_instance.yml index 6b03344596..7d2fc8671c 100644 --- a/playbooks/f19_temp_instance.yml +++ b/playbooks/f19_temp_instance.yml @@ -8,7 +8,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" vars: - keypair: fedora-admin-20130801 - image: "{{ f19_qcow_id }}" @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/f20_temp_instance.yml b/playbooks/f20_temp_instance.yml index e74232bbab..b88ed33a8b 100644 --- a/playbooks/f20_temp_instance.yml +++ b/playbooks/f20_temp_instance.yml @@ -8,7 +8,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" vars: - keypair: fedora-admin-20130801 - image: "{{ f20_qcow_id }}" @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/fedora_temp_instance.yml b/playbooks/fedora_temp_instance.yml index 5197e9c1b5..ca83bd24d2 100644 --- a/playbooks/fedora_temp_instance.yml +++ b/playbooks/fedora_temp_instance.yml @@ -8,7 +8,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" vars: - keypair: fedora-admin-20130801 - image: "{{ f18_qcow_id }}" @@ -25,7 +25,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 9ebd9e4ff7..5c414aac6e 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -55,7 +55,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml pre_tasks: @@ -86,7 +86,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/arm-packager.yml b/playbooks/groups/arm-packager.yml index 64b69d17bc..fafe82fd18 100644 --- a/playbooks/groups/arm-packager.yml +++ b/playbooks/groups/arm-packager.yml @@ -8,7 +8,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index 5935790a78..7a34c2ca84 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -8,7 +8,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index 6231eb3165..131432ade8 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/atomic.yml b/playbooks/groups/atomic.yml index 0ce77bf71b..eb133498db 100644 --- a/playbooks/groups/atomic.yml +++ b/playbooks/groups/atomic.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index adea79118b..a27a374f21 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index dc9fc568e6..ac7908c851 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 7fef846372..601b7ebf59 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -63,7 +63,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 0e202752c9..641b49bfe1 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 622c5b867e..d2aa164f09 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 1efbe5ed03..6c9b5e586f 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -25,7 +25,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml index b9797580eb..8766343fad 100644 --- a/playbooks/groups/bodhi.yml +++ b/playbooks/groups/bodhi.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index 421b888632..4908ed61f2 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -59,7 +59,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index bb74ab85ba..0054099947 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 29cad5876b..1072316b24 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index f72b928a47..85f339d8db 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -65,7 +65,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" handlers: diff --git a/playbooks/groups/composers.yml b/playbooks/groups/composers.yml index 6337870c69..aa3509d910 100644 --- a/playbooks/groups/composers.yml +++ b/playbooks/groups/composers.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -28,7 +28,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -67,7 +67,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/copr-backend.yml b/playbooks/groups/copr-backend.yml index d5753e02ff..2d3dbb7208 100644 --- a/playbooks/groups/copr-backend.yml +++ b/playbooks/groups/copr-backend.yml @@ -6,7 +6,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -17,7 +17,7 @@ #hosts: copr-back vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" @@ -30,7 +30,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # Roles are run first, before tasks, regardless of where you place them here. diff --git a/playbooks/groups/copr-frontend.yml b/playbooks/groups/copr-frontend.yml index 090861ab43..70f4237605 100644 --- a/playbooks/groups/copr-frontend.yml +++ b/playbooks/groups/copr-frontend.yml @@ -6,7 +6,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -18,7 +18,7 @@ #hosts: copr-front vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" @@ -31,7 +31,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/copr-keygen.yml b/playbooks/groups/copr-keygen.yml index ddc3e2f3ad..376b2a8aa0 100644 --- a/playbooks/groups/copr-keygen.yml +++ b/playbooks/groups/copr-keygen.yml @@ -6,7 +6,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -17,7 +17,7 @@ #hosts: copr-keygen-stg vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" @@ -29,7 +29,7 @@ user: root vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - base diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 72f47600ff..e8100fd04a 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -7,7 +7,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -23,7 +23,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -57,7 +57,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -80,7 +80,7 @@ # # vars_files: # - /srv/web/infra/ansible/vars/global.yml -# - "{{ private }}/vars.yml" +# - "/srv/private/ansible/vars.yml" # - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # # roles: @@ -102,7 +102,7 @@ # # vars_files: # - /srv/web/infra/ansible/vars/global.yml -# - "{{ private }}/vars.yml" +# - "/srv/private/ansible/vars.yml" # - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # # roles: diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index 169bc7bd35..6fa05c836e 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index 35b447397a..bed78c55c3 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -27,7 +27,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index b1668f95bb..3c7d59d166 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -55,7 +55,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 694c725707..31c8749987 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -6,7 +6,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -23,7 +23,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -39,7 +39,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" roles: diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index af3e5e2b5a..66a1e7703b 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -53,7 +53,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: @@ -69,7 +69,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index f8a60c899a..966f54b184 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -27,7 +27,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 26c76f4a7b..33e8deb0a2 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -8,7 +8,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -24,7 +24,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -72,7 +72,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/fedoauth.yml b/playbooks/groups/fedoauth.yml index ff964f01fa..02f1dc8a6e 100644 --- a/playbooks/groups/fedoauth.yml +++ b/playbooks/groups/fedoauth.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -58,7 +58,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index b27843f4eb..2974af521d 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -58,7 +58,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: @@ -74,7 +74,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index 17972eb0d0..47358a9373 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -55,7 +55,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 6956a93343..85b22a33f1 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -59,7 +59,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index 03ef43056d..bfc8291223 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -58,7 +58,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -80,7 +80,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml index 4cec7db032..263fc4f341 100644 --- a/playbooks/groups/jenkins-cloud.yml +++ b/playbooks/groups/jenkins-cloud.yml @@ -7,7 +7,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -22,7 +22,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml vars: - resolvconf: resolv.conf/jenkins-cloud @@ -285,7 +285,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -307,7 +307,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" vars: - keypair: fedora-admin-20130801 - security_group: default @@ -325,7 +325,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 6e13c454d9..861a57327d 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -58,7 +58,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 3afa028b54..652c743b3d 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index df7f6e90aa..5474d7ff01 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -27,7 +27,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/lockbox.yml b/playbooks/groups/lockbox.yml index c98e604f75..6dbcc708aa 100644 --- a/playbooks/groups/lockbox.yml +++ b/playbooks/groups/lockbox.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -50,7 +50,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index f537a17ea7..5144652fe8 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -25,7 +25,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" roles: @@ -75,7 +75,7 @@ sudo_user: postgres vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" tasks: @@ -108,7 +108,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml" roles: diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 90d52b0268..8a4a46a662 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/mirrorlist.yml b/playbooks/groups/mirrorlist.yml index 8f6741d371..dc039bdeae 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index a0fda13853..190d10a17f 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -50,7 +50,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -66,7 +66,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -82,7 +82,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 5cb202e5fc..9f7fa9d1e0 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -54,7 +54,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/nagios.{{ inventory_hostname_short }}.yml diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 89dc3a4ed2..b7cefaf1c5 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -65,7 +65,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index ff105dded6..b3b8a98d21 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index c066498180..3f2814d33e 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -58,7 +58,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -74,7 +74,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -104,7 +104,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -134,7 +134,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index d9f8e3676b..a25717b586 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -59,7 +59,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -81,7 +81,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -106,7 +106,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index 282979372c..432a17133c 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 4bcae38378..18f8fc2915 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -27,7 +27,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -70,7 +70,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 3c60e4e6fe..3470ffe252 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -58,7 +58,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: @@ -74,7 +74,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 49511c028d..3a24f40ff7 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -60,7 +60,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 8a89394b5d..7af57c54b1 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -27,7 +27,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/proxies-certificates.yml b/playbooks/groups/proxies-certificates.yml index 28e25bff2d..0f1fd7423e 100644 --- a/playbooks/groups/proxies-certificates.yml +++ b/playbooks/groups/proxies-certificates.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/proxies-fedora-web.yml b/playbooks/groups/proxies-fedora-web.yml index c2d2ed8053..dffb1d78db 100644 --- a/playbooks/groups/proxies-fedora-web.yml +++ b/playbooks/groups/proxies-fedora-web.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/proxies-haproxy.yml b/playbooks/groups/proxies-haproxy.yml index b62cd33295..ea5ffb696f 100644 --- a/playbooks/groups/proxies-haproxy.yml +++ b/playbooks/groups/proxies-haproxy.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/proxies-miscellaneous.yml b/playbooks/groups/proxies-miscellaneous.yml index ded93837da..60f585540e 100644 --- a/playbooks/groups/proxies-miscellaneous.yml +++ b/playbooks/groups/proxies-miscellaneous.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/proxies-redirects.yml b/playbooks/groups/proxies-redirects.yml index 934c073411..e762560db8 100644 --- a/playbooks/groups/proxies-redirects.yml +++ b/playbooks/groups/proxies-redirects.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/proxies-reverseproxy.yml b/playbooks/groups/proxies-reverseproxy.yml index 91af61acf6..a16d31032e 100644 --- a/playbooks/groups/proxies-reverseproxy.yml +++ b/playbooks/groups/proxies-reverseproxy.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/proxies-rewrites.yml b/playbooks/groups/proxies-rewrites.yml index 699573e3f4..4676df797c 100644 --- a/playbooks/groups/proxies-rewrites.yml +++ b/playbooks/groups/proxies-rewrites.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/proxies-websites.yml b/playbooks/groups/proxies-websites.yml index 31112833e7..309eb482e1 100644 --- a/playbooks/groups/proxies-websites.yml +++ b/playbooks/groups/proxies-websites.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index fd539bf7ca..4c5e7d7fdc 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -7,7 +7,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -23,7 +23,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -72,7 +72,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: @@ -102,7 +102,7 @@ # # vars_files: # - /srv/web/infra/ansible/vars/global.yml -# - "{{ private }}/vars.yml" +# - "/srv/private/ansible/vars.yml" # - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # # tasks: diff --git a/playbooks/groups/qadevel-stg.yml b/playbooks/groups/qadevel-stg.yml index 88b50efb19..488b60d272 100644 --- a/playbooks/groups/qadevel-stg.yml +++ b/playbooks/groups/qadevel-stg.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -56,7 +56,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/qadevel.yml b/playbooks/groups/qadevel.yml index 277939a737..e9952c2493 100644 --- a/playbooks/groups/qadevel.yml +++ b/playbooks/groups/qadevel.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -56,7 +56,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -73,7 +73,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index edcfdb063c..e489381015 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -23,7 +23,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index f1ff6973f4..65f0daf53f 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -56,7 +56,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index 7a39908347..3dff1f5a00 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -57,7 +57,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index 8cf79e0fc0..b49c27fc52 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index ebe7cfcd67..67519ce3e9 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -6,7 +6,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 300b83a962..7332e64e08 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -7,7 +7,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -23,7 +23,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index 90ed6e7a1a..8bc1e16b24 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -58,7 +58,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -80,7 +80,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml handlers: diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 0b58e9184c..64be515e70 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index 836fb3ffab..2ce0e26109 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -59,7 +59,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -76,7 +76,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/taskotron-dev-clients.yml b/playbooks/groups/taskotron-dev-clients.yml index c514f7ba17..86a9af76a3 100644 --- a/playbooks/groups/taskotron-dev-clients.yml +++ b/playbooks/groups/taskotron-dev-clients.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -55,7 +55,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml index 73be6fe740..dc343309ed 100644 --- a/playbooks/groups/taskotron-dev.yml +++ b/playbooks/groups/taskotron-dev.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -56,7 +56,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -92,7 +92,7 @@ # # this eventually needs to differentiate between staging and production cedrts # vars_files: # - /srv/web/infra/ansible/vars/global.yml -# - "{{ private }}/vars.yml" +# - "/srv/private/ansible/vars.yml" # - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # # tasks: diff --git a/playbooks/groups/taskotron-prod-clients.yml b/playbooks/groups/taskotron-prod-clients.yml index 184ab10cce..a0411421aa 100644 --- a/playbooks/groups/taskotron-prod-clients.yml +++ b/playbooks/groups/taskotron-prod-clients.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -55,7 +55,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/taskotron-prod.yml b/playbooks/groups/taskotron-prod.yml index 767993d8ec..2740d69866 100644 --- a/playbooks/groups/taskotron-prod.yml +++ b/playbooks/groups/taskotron-prod.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -58,7 +58,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/taskotron-stg-clients.yml b/playbooks/groups/taskotron-stg-clients.yml index 9526bd2f92..e246fcf832 100644 --- a/playbooks/groups/taskotron-stg-clients.yml +++ b/playbooks/groups/taskotron-stg-clients.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -55,7 +55,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/taskotron-stg.yml b/playbooks/groups/taskotron-stg.yml index a4960f13a3..1b5be7808b 100644 --- a/playbooks/groups/taskotron-stg.yml +++ b/playbooks/groups/taskotron-stg.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -56,7 +56,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index e211b62e47..de11deaa96 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 05ca9419a0..fef651590c 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 9174db462f..b7e1cdf979 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 1bed373ff6..06d0423ad5 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/hosts/209.132.184.148.yml b/playbooks/hosts/209.132.184.148.yml index 01a692140b..dea2091249 100644 --- a/playbooks/hosts/209.132.184.148.yml +++ b/playbooks/hosts/209.132.184.148.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -17,7 +17,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars//{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/artboard.cloud.fedoraproject.org.yml b/playbooks/hosts/artboard.cloud.fedoraproject.org.yml index 0b5c63020c..406981aded 100644 --- a/playbooks/hosts/artboard.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/artboard.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml index 4ccca843f6..517c06fb4f 100644 --- a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/bodhi.dev.fedoraproject.org.yml b/playbooks/hosts/bodhi.dev.fedoraproject.org.yml index 5d47fbef8e..41e8b3307a 100644 --- a/playbooks/hosts/bodhi.dev.fedoraproject.org.yml +++ b/playbooks/hosts/bodhi.dev.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index 2624deffd4..7895685aa9 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -7,7 +7,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/hosts/devpi.cloud.fedoraproject.org.yml b/playbooks/hosts/devpi.cloud.fedoraproject.org.yml index 6cce6c64d0..d7831a80c2 100644 --- a/playbooks/hosts/devpi.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/devpi.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml index b5b1744143..5461c7d6e1 100644 --- a/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/fed-cloud10.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud10.cloud.fedoraproject.org.yml index 79ba01002b..7bd50cf898 100644 --- a/playbooks/hosts/fed-cloud10.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud10.cloud.fedoraproject.org.yml @@ -8,7 +8,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - /srv/web/infra/ansible/vars/fedora-cloud.yml - "{{ private }}/files/openstack/passwords.yml" diff --git a/playbooks/hosts/fed-cloud11.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud11.cloud.fedoraproject.org.yml index 97f79cd6cd..14ce24381a 100644 --- a/playbooks/hosts/fed-cloud11.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud11.cloud.fedoraproject.org.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml # - /srv/web/infra/ansible/vars/fedora-cloud.yml # - "{{ private }}/files/openstack/passwords.yml" diff --git a/playbooks/hosts/fedocal.dev.fedoraproject.org.yml b/playbooks/hosts/fedocal.dev.fedoraproject.org.yml index 5ecf0b91d6..20f179b749 100644 --- a/playbooks/hosts/fedocal.dev.fedoraproject.org.yml +++ b/playbooks/hosts/fedocal.dev.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/hrf.cloud.fedoraproject.org.yml b/playbooks/hosts/hrf.cloud.fedoraproject.org.yml index 43c66a1004..b3eafe2a8b 100644 --- a/playbooks/hosts/hrf.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/hrf.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -17,7 +17,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -33,7 +33,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/junk02.phx2.fedoraproject.org.yml b/playbooks/hosts/junk02.phx2.fedoraproject.org.yml index f9c24d297b..5d7c301418 100644 --- a/playbooks/hosts/junk02.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/junk02.phx2.fedoraproject.org.yml @@ -7,7 +7,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml index 7bc48af487..4f681bda1e 100644 --- a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -37,7 +37,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index 93384e749d..60565ed35e 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -17,7 +17,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml vars: - mailman_vardir: /srv/persist/mailman @@ -85,7 +85,7 @@ sudo_user: postgres vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" vars: - mailman_vardir: /srv/persist/mailman @@ -115,7 +115,7 @@ gather_facts: no vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: diff --git a/playbooks/hosts/logserver.yml b/playbooks/hosts/logserver.yml index 009e1e90b8..8decfd1dab 100644 --- a/playbooks/hosts/logserver.yml +++ b/playbooks/hosts/logserver.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -21,7 +21,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml index 914b922439..45caf15572 100644 --- a/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml index 6fd9f51696..af9acb337b 100644 --- a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml @@ -5,7 +5,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" tasks: - include: "{{ tasks }}/persistent_cloud.yml" @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml index 88791012ee..b7c5dbce9b 100644 --- a/playbooks/manual/kernel-qa.yml +++ b/playbooks/manual/kernel-qa.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/manual/push-badges.yml b/playbooks/manual/push-badges.yml index c5f79f5631..fdc285f943 100644 --- a/playbooks/manual/push-badges.yml +++ b/playbooks/manual/push-badges.yml @@ -14,7 +14,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml vars: @@ -47,7 +47,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: @@ -63,7 +63,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml index d5d28b1f7e..790e284370 100644 --- a/playbooks/manual/qadevel.yml +++ b/playbooks/manual/qadevel.yml @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/manual/restart-fedmsg-services.yml b/playbooks/manual/restart-fedmsg-services.yml index 8499ee9612..c2916e623d 100644 --- a/playbooks/manual/restart-fedmsg-services.yml +++ b/playbooks/manual/restart-fedmsg-services.yml @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -40,7 +40,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -54,7 +54,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -68,7 +68,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/manual/sign-bridge.yml b/playbooks/manual/sign-bridge.yml index 9fad92bf6d..32dbf8c7f1 100644 --- a/playbooks/manual/sign-bridge.yml +++ b/playbooks/manual/sign-bridge.yml @@ -13,7 +13,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml index 2f44185744..924370f374 100644 --- a/playbooks/manual/sign-vault.yml +++ b/playbooks/manual/sign-vault.yml @@ -13,7 +13,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: diff --git a/playbooks/set_root_auth_keys.yml b/playbooks/set_root_auth_keys.yml index ba487f52e0..2fa9d17604 100644 --- a/playbooks/set_root_auth_keys.yml +++ b/playbooks/set_root_auth_keys.yml @@ -6,7 +6,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.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 e80e50d0f0..0543525f86 100644 --- a/playbooks/transient_post_provision.yml +++ b/playbooks/transient_post_provision.yml @@ -14,7 +14,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: diff --git a/playbooks/update-proxy-dns.yml b/playbooks/update-proxy-dns.yml index b952e21294..bbeea74e47 100644 --- a/playbooks/update-proxy-dns.yml +++ b/playbooks/update-proxy-dns.yml @@ -9,7 +9,7 @@ serial: 1 vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ private }}/vars.yml" + - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml vars: