diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml index 1242cfc05f..bebccc01d4 100644 --- a/playbooks/cloud_prep.yml +++ b/playbooks/cloud_prep.yml @@ -4,7 +4,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/el6_temp_instance.yml b/playbooks/el6_temp_instance.yml index f18c48333d..a8f006c4b0 100644 --- a/playbooks/el6_temp_instance.yml +++ b/playbooks/el6_temp_instance.yml @@ -27,7 +27,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/growroot_cloud.yml" diff --git a/playbooks/f19_temp_instance.yml b/playbooks/f19_temp_instance.yml index 8fe3cd5db4..cbc7e261bf 100644 --- a/playbooks/f19_temp_instance.yml +++ b/playbooks/f19_temp_instance.yml @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - name: growpart /dev/vda1 partition (/) to full size diff --git a/playbooks/fedora_temp_instance.yml b/playbooks/fedora_temp_instance.yml index 9ef6a7aa4a..fba938c06b 100644 --- a/playbooks/fedora_temp_instance.yml +++ b/playbooks/fedora_temp_instance.yml @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/growroot_cloud.yml" diff --git a/playbooks/groups/arm-packager.yml b/playbooks/groups/arm-packager.yml index 31190acf4f..3786f51263 100644 --- a/playbooks/groups/arm-packager.yml +++ b/playbooks/groups/arm-packager.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index c8fa2b57db..92790c7369 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/arm-releng.yml b/playbooks/groups/arm-releng.yml index e10f5c339d..686c6e201c 100644 --- a/playbooks/groups/arm-releng.yml +++ b/playbooks/groups/arm-releng.yml @@ -9,7 +9,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index d293269b7d..e19345e310 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -1,7 +1,7 @@ # create a new backup server system # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this instance on the buildvmhost -# NOTE: most of these vars come from group_vars/backup_server or from hostvars +# NOTE: most of these vars_path come from group_vars/backup_server or from hostvars - name: make backup server system hosts: backup03.phx2.fedoraproject.org @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 14ad19e1b1..2ba35f7140 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -1,7 +1,7 @@ # create a new badges-backend server # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/mirrorlist or from hostvars +# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars - name: make badges-backend server hosts: badges-backend;badges-backend-stg @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -64,4 +64,4 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 6ad4d8d17e..86be68733c 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -1,7 +1,7 @@ # create a new badges-web server # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/badges-web* or from hostvars +# NOTE: most of these vars_path come from group_vars/badges-web* or from hostvars - name: make badges-web server hosts: badges-web;badges-web-stg @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index a8eccc0656..954c34fd9b 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -1,6 +1,6 @@ # create a new beaker server # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/mirrorlist or from hostvars +# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars - name: make beaker server hosts: beaker @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/bkernel.yml b/playbooks/groups/bkernel.yml index b79b36159b..30344531a9 100644 --- a/playbooks/groups/bkernel.yml +++ b/playbooks/groups/bkernel.yml @@ -1,6 +1,6 @@ # provision a new koji bkernel # NOTE: this assumes the bkernel boxes are already up and are accessible -# NOTE: most of these vars come from group_vars/bkernel or from hostvars +# NOTE: most of these vars_path come from group_vars/bkernel or from hostvars - name: make koji bkernel hosts: bkernel @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 62bede2114..3b860944df 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -1,16 +1,17 @@ # create a new koji builder on raw hw # NOTE: should be used with --limit most of the time -# NOTE: most of these vars come from group_vars/buildhw or from hostvars +# NOTE: most of these vars_path come from group_vars/buildhw or from hostvars - name: make koji builder(s) on raw hw hosts: buildhw;buildppc;buildarm user: root gather_facts: True + accellerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -26,17 +27,16 @@ - name: restart kojid action: service name=kojid state=restarted - - - name: make koji builder(s) on raw hw hosts: buildhw user: root gather_facts: True + accellerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -50,5 +50,3 @@ - name: restart kojid action: service name=kojid state=restarted - - diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index e5d8765713..41e43d45fb 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -1,7 +1,7 @@ # create a new koji builder # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this builder on the buildvmhost -# NOTE: most of these vars come from group_vars/buildvm or from hostvars +# NOTE: most of these vars_path come from group_vars/buildvm or from hostvars - name: make buildvm hosts: buildvm @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index 3bbe04fdf7..5db4448c5e 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -6,7 +6,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -22,7 +22,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 762f9dbe40..b9c06e9084 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -1,7 +1,7 @@ # create a new fedocal server # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/fedocal* or from hostvars +# NOTE: most of these vars_path come from group_vars/fedocal* or from hostvars - name: make fedocal hosts: fedocal-stg;fedocal @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -61,7 +61,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/fedmsg_base @@ -78,7 +78,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/fedocal diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index 983fc24758..16948be5b8 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -1,7 +1,7 @@ # create a new gallery server # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/gallery-web* or from hostvars +# NOTE: most of these vars_path come from group_vars/gallery-web* or from hostvars - name: make gallery server hosts: gallery-stg @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -59,7 +59,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/gallery diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml index 75e1758b13..04e699b8b1 100644 --- a/playbooks/groups/jenkins-cloud.yml +++ b/playbooks/groups/jenkins-cloud.yml @@ -23,7 +23,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" vars: - resolvconf: resolv.conf/jenkins-cloud @@ -168,7 +168,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/groups/kernel-qa.yml b/playbooks/groups/kernel-qa.yml index eb2d476318..78ae1b2fa5 100644 --- a/playbooks/groups/kernel-qa.yml +++ b/playbooks/groups/kernel-qa.yml @@ -1,6 +1,6 @@ # provision a new kernel-qa system # NOTE: this assumes the kernel-qa boxes are already up and are accessible -# NOTE: most of these vars come from group_vars/kernel-qa or from hostvars +# NOTE: most of these vars_path come from group_vars/kernel-qa or from hostvars - name: make kernel-qa hosts: kernel-qa @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 75cc3e5dff..319c8650ff 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -1,7 +1,7 @@ # create a new sks keyserver # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/gallery-web* or from hostvars +# NOTE: most of these vars_path come from group_vars/gallery-web* or from hostvars - name: make sks keyserver hosts: keys01.fedoraproject.org @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 5d0044d03c..490348d120 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -1,6 +1,6 @@ # create a new koji hub server system # NOTE: should be used with --limit most of the time -# NOTE: most of these vars come from group_vars/koji-hub or from hostvars +# NOTE: most of these vars_path come from group_vars/koji-hub or from hostvars - name: make koji hub hosts: koji-hub-secondary @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -28,7 +28,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 352b6dd7b1..acb021e038 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -1,6 +1,6 @@ # create a new mailman server # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/mirrorlist or from hostvars +# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars - name: make mailman server hosts: mailman-stg @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -63,7 +63,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: # mailman auto-updates its schema, there can only be one admin user @@ -94,7 +94,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/mailman diff --git a/playbooks/groups/mirrorlist.yml b/playbooks/groups/mirrorlist.yml index ceb8a902d8..400cd534e3 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -1,7 +1,7 @@ # create a new mirrorlist server # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/mirrorlist or from hostvars +# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars - name: make mirrorlist app server hosts: mirrorlist @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 3a93b90890..3a2499050b 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -1,7 +1,7 @@ # create a new notifs-backend server # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/mirrorlist or from hostvars +# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars - name: make notifs-backend server hosts: notifs-backend;notifs-backend-stg @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -64,4 +64,4 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index b9af3269ed..376e1d0ead 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -1,7 +1,7 @@ # create a new notifs-web server # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/notifs-web* or from hostvars +# NOTE: most of these vars_path come from group_vars/notifs-web* or from hostvars - name: make notifs-web server hosts: notifs-web;notifs-web-stg @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 602ed3d71b..9b2efa086d 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -1,7 +1,7 @@ # create a new nuancier server # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/nuancier* or from hostvars +# NOTE: most of these vars_path come from group_vars/nuancier* or from hostvars - name: make nuancier hosts: nuancier;nuancier-stg @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -29,7 +29,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -61,7 +61,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/fedmsg_base @@ -78,7 +78,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/nuancier diff --git a/playbooks/groups/postgresl-server.yml b/playbooks/groups/postgresl-server.yml index 1953381340..6b652a77dc 100644 --- a/playbooks/groups/postgresl-server.yml +++ b/playbooks/groups/postgresl-server.yml @@ -1,6 +1,6 @@ # create a new database server system # NOTE: should be used with --limit most of the time -# NOTE: most of these vars come from group_vars/backup_server or from hostvars +# NOTE: most of these vars_path come from group_vars/backup_server or from hostvars - name: make postgresql-server hosts: dbserver-secondary @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -28,7 +28,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base @@ -55,7 +55,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/koji_db diff --git a/playbooks/groups/releng.yml b/playbooks/groups/releng.yml index 1b61778296..318ab76dfb 100644 --- a/playbooks/groups/releng.yml +++ b/playbooks/groups/releng.yml @@ -1,7 +1,7 @@ # create a new releng system # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this instance on the buildvmhost -# NOTE: most of these vars come from group_vars/releng or from hostvars +# NOTE: most of these vars_path come from group_vars/releng or from hostvars - name: make releng systems hosts: releng01.phx2.fedoraproject.org:releng02.phx2.fedoraproject.org @@ -12,7 +12,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -31,7 +31,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/sign.yml b/playbooks/groups/sign.yml index 5d0468e65a..458c7d1d79 100644 --- a/playbooks/groups/sign.yml +++ b/playbooks/groups/sign.yml @@ -1,6 +1,6 @@ # provision a new sign server. # NOTE: this assumes the boxes are already up and are accessible -# NOTE: most of these vars come from group_vars/sign or from hostvars +# NOTE: most of these vars_path come from group_vars/sign or from hostvars # # FURTHER NOTE: some of These machines run day to day with sshd disabled/off. # Access is via management interface only. This playbook does initial setup. @@ -14,7 +14,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/taskbot.yml b/playbooks/groups/taskbot.yml index 8a9f3c4fcf..6135ec2a87 100644 --- a/playbooks/groups/taskbot.yml +++ b/playbooks/groups/taskbot.yml @@ -1,6 +1,6 @@ # create a new taskbot server # NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars come from group_vars/mirrorlist or from hostvars +# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars - name: make taskbot server hosts: taskbot @@ -10,7 +10,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/virt_instance_create.yml" @@ -26,7 +26,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 728ed3a616..6bbad55496 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -1,6 +1,6 @@ # create a new virthost server system # NOTE: should be used with --limit most of the time -# NOTE: most of these vars come from group_vars/backup_server or from hostvars +# NOTE: most of these vars_path come from group_vars/backup_server or from hostvars - name: make virthost server system hosts: virthost15.phx2.fedoraproject.org:bvirthost07.phx2.fedoraproject.org:buildvmhost-10.phx2.fedoraproject.org:buildvmhost-11.phx2.fedoraproject.org:buildvmhost-12.phx2.fedoraproject.org @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" roles: - /srv/web/infra/ansible/roles/base diff --git a/playbooks/hosts/artboard.cloud.fedoraproject.org.yml b/playbooks/hosts/artboard.cloud.fedoraproject.org.yml index 4290cb45c1..cc180db01d 100644 --- a/playbooks/hosts/artboard.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/artboard.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml index cdb4e0de0f..3e23af1796 100644 --- a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml @@ -22,7 +22,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml index 40355bbd06..ca33ea5737 100644 --- a/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-be-dev.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml index 19b3ce75a0..02ab39ad04 100644 --- a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" # Roles are run first, before tasks, regardless of where you place them here. roles: diff --git a/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml index e28cb5e40b..956ca807f1 100644 --- a/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-fe-dev.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml index d7f2dd9561..82b98f579c 100644 --- a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml index 077c8dbd7e..de112dfb1a 100644 --- a/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/elections-dev.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/fedocal.dev.fedoraproject.org.yml b/playbooks/hosts/fedocal.dev.fedoraproject.org.yml index ecf338b7a8..36e6b2deef 100644 --- a/playbooks/hosts/fedocal.dev.fedoraproject.org.yml +++ b/playbooks/hosts/fedocal.dev.fedoraproject.org.yml @@ -22,7 +22,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/hrf.cloud.fedoraproject.org.yml b/playbooks/hosts/hrf.cloud.fedoraproject.org.yml index efa32a22a4..535a43902c 100644 --- a/playbooks/hosts/hrf.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/hrf.cloud.fedoraproject.org.yml @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" @@ -34,7 +34,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - name: install deps diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index 979408c3cd..d60d38cce5 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -18,7 +18,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" vars: - mailman_vardir: /srv/persist/mailman @@ -106,7 +106,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" vars: - mailman_vardir: /srv/persist/mailman @@ -134,7 +134,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" vars: - mailman_vardir: /srv/persist/mailman diff --git a/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml index 233f7727a4..bc961aeea9 100644 --- a/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/logstash-dev.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml index be337fb370..1423b281b0 100644 --- a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml @@ -19,7 +19,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/playbooks/restart_unbound.yml b/playbooks/restart_unbound.yml index f3138bd8f6..be8fbe0e48 100644 --- a/playbooks/restart_unbound.yml +++ b/playbooks/restart_unbound.yml @@ -11,7 +11,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/restart_unbound.yml" diff --git a/playbooks/set_root_auth_keys.yml b/playbooks/set_root_auth_keys.yml index f54d3cc3da..eb3a120d32 100644 --- a/playbooks/set_root_auth_keys.yml +++ b/playbooks/set_root_auth_keys.yml @@ -7,7 +7,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" vars: - root_auth_users: '' diff --git a/playbooks/transient_post_provision.yml b/playbooks/transient_post_provision.yml index b0395d1915..8893be1f64 100644 --- a/playbooks/transient_post_provision.yml +++ b/playbooks/transient_post_provision.yml @@ -15,7 +15,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/growroot_cloud.yml" diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 470a911b9b..fa857b702f 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -104,7 +104,7 @@ vars_files: - /srv/web/infra/ansible/vars/global.yml - - "{{ vars }}/{{ ansible_distribution }}.yml" + - "{{ vars_path }}/{{ ansible_distribution }}.yml" tasks: - include: "{{ tasks }}/restart_unbound.yml" diff --git a/vars/global.yml b/vars/global.yml index eff69a9e34..2f9b48d824 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -7,7 +7,6 @@ files: /srv/web/infra/ansible/files roles: /srv/web/infra/ansible/roles handlers: /srv/web/infra/ansible/handlers tasks: /srv/web/infra/ansible/tasks -vars: /srv/web/infra/ansible/vars vars_path: /srv/web/infra/ansible/vars is_fedora: "'{{ ansible_distribution }}' == 'Fedora'" is_rhel: "'{{ ansible_distribution }}' == 'RedHat'"