diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2015-01-09 22:59:18 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2015-01-09 22:59:18 +0000 |
| commit | d64ab29c0e03e27d85bc26d4258b5bafb4dffb80 (patch) | |
| tree | 60e3498f2db85e2c89238f7a8bf187e21b05b0a2 | |
| parent | dd61ac146b380fdbae6daf0686aec5022139ee92 (diff) | |
New ansible doesn't like expanding {{ private }} in the same list of vars files it's defined in.
114 files changed, 276 insertions, 276 deletions
diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index 6bf0213d8..e59208785 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 6b1a4d1c2..1b542eacb 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 17aa36cf4..fabc1048d 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 6b0334459..7d2fc8671 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 e74232bba..b88ed33a8 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 5197e9c1b..ca83bd24d 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 9ebd9e4ff..5c414aac6 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 64b69d17b..fafe82fd1 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 5935790a7..7a34c2ca8 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 6231eb316..131432ade 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 0ce77bf71..eb133498d 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 adea79118..a27a374f2 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 dc9fc568e..ac7908c85 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 7fef84637..601b7ebf5 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 0e202752c..641b49bfe 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 622c5b867..d2aa164f0 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 1efbe5ed0..6c9b5e586 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 b9797580e..8766343fa 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 421b88863..4908ed61f 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 bb74ab85b..005409994 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 29cad5876..1072316b2 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 f72b928a4..85f339d8d 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 6337870c6..aa3509d91 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 d5753e02f..2d3dbb720 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 090861ab4..70f423760 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 ddc3e2f3a..376b2a8aa 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 72f47600f..e8100fd04 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 169bc7bd3..6fa05c836 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 35b447397..bed78c55c 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 b1668f95b..3c7d59d16 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 694c72570..31c874998 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 af3e5e2b5..66a1e7703 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 f8a60c899..966f54b18 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 26c76f4a7..33e8deb0a 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 ff964f01f..02f1dc8a6 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 b27843f4e..2974af521 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 17972eb0d..47358a937 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 6956a9334..85b22a33f 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 03ef43056..bfc829122 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 4cec7db03..263fc4f34 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 6e13c454d..861a57327 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 3afa028b5..652c743b3 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 df7f6e90a..5474d7ff0 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 c98e604f7..6dbcc708a 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 f537a17ea..5144652fe 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 90d52b026..8a4a46a66 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 8f6741d37..dc039bdea 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 a0fda1385..190d10a17 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 5cb202e5f..9f7fa9d1e 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 89dc3a4ed..b7cefaf1c 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 ff105dded..b3b8a98d2 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 c06649818..3f2814d33 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 d9f8e3676..a25717b58 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 282979372..432a17133 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 4bcae3837..18f8fc291 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 3c60e4e6f..3470ffe25 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 49511c028..3a24f40ff 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 8a89394b5..7af57c54b 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 28e25bff2..0f1fd7423 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 c2d2ed805..dffb1d78d 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 b62cd3329..ea5ffb696 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 ded93837d..60f585540 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 934c07341..e762560db 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 91af61acf..a16d31032 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 699573e3f..4676df797 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 31112833e..309eb482e 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 fd539bf7c..4c5e7d7fd 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 88b50efb1..488b60d27 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 277939a73..e9952c249 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 edcfdb063..e48938101 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 f1ff6973f..65f0daf53 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 7a3990834..3dff1f5a0 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 8cf79e0fc..b49c27fc5 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 ebe7cfcd6..67519ce3e 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 300b83a96..7332e64e0 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 90ed6e7a1..8bc1e16b2 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 0b58e9184..64be515e7 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 836fb3ffa..2ce0e2610 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 c514f7ba1..86a9af76a 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 73be6fe74..dc343309e 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 184ab10cc..a0411421a 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 767993d8e..2740d6986 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 9526bd2f9..e246fcf83 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 a4960f13a..1b5be7808 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 e211b62e4..de11deaa9 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 05ca9419a..fef651590 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 9174db462..b7e1cdf97 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 1bed373ff..06d0423ad 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 01a692140..dea209124 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 0b5c63020..406981ade 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 4ccca843f..517c06fb4 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 5d47fbef8..41e8b3307 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 2624deffd..7895685aa 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 6cce6c64d..d7831a80c 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 b5b174414..5461c7d6e 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 79ba01002..7bd50cf89 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 97f79cd6c..14ce24381 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 5ecf0b91d..20f179b74 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 43c66a100..b3eafe2a8 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 f9c24d297..5d7c30141 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 7bc48af48..4f681bda1 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 93384e749..60565ed35 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 009e1e90b..8decfd1da 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 914b92243..45caf1557 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 6fd9f5169..af9acb337 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 88791012e..b7c5dbce9 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 c5f79f563..fdc285f94 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 d5d28b1f7..790e28437 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 8499ee961..c2916e623 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 9fad92bf6..32dbf8c7f 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 2f4418574..924370f37 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 ba487f52e..2fa9d1760 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 e80e50d0f..0543525f8 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 b952e2129..bbeea74e4 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: |