diff --git a/filter_plugins/fedmsg.py b/filter_plugins/fedmsg.py index c8ca7072ab..4963728ef9 100644 --- a/filter_plugins/fedmsg.py +++ b/filter_plugins/fedmsg.py @@ -11,7 +11,7 @@ def invert_fedmsg_policy(groups, vars, env): if env == 'staging': hosts = groups['all'] + groups['staging'] + groups['fedmsg-qa-network-stg'] + groups['openshift-pseudohosts-stg'] else: - hosts = [h for h in groups['all'] if h not in groups['staging'] + groups['openshift-pseudohosts-stg']] + hosts = [h for h in groups['all'] if h not in groups['staging'] + groups['openshift_pseudohosts_stg']] inverted = {} for host in hosts: diff --git a/inventory/builders b/inventory/builders index 0535310bb9..9d39cced09 100644 --- a/inventory/builders +++ b/inventory/builders @@ -32,29 +32,29 @@ buildvm-30.phx2.fedoraproject.org buildvm-31.phx2.fedoraproject.org buildvm-32.phx2.fedoraproject.org -[buildvm-stg] +[buildvm_stg] buildvm-01.stg.phx2.fedoraproject.org buildvm-02.stg.phx2.fedoraproject.org buildvm-03.stg.phx2.fedoraproject.org buildvm-04.stg.phx2.fedoraproject.org buildvm-05.stg.phx2.fedoraproject.org -[buildvm-ppc64-stg] +[buildvm_ppc64_stg] buildvm-ppc64-01.stg.ppc.fedoraproject.org -[buildvm-ppc64le-stg] +[buildvm_ppc64le_stg] buildvm-ppc64le-01.stg.ppc.fedoraproject.org -[buildvm-aarch64-stg] +[buildvm_aarch64_stg] buildvm-aarch64-01.stg.arm.fedoraproject.org -[buildvm-armv7-stg] +[buildvm_armv7_stg] buildvm-armv7-01.stg.arm.fedoraproject.org -[buildvm-s390x-stg] +[buildvm_s390x_stg] buildvm-s390x-01.stg.s390.fedoraproject.org -[buildvm-aarch64] +[buildvm_aarch64] buildvm-aarch64-01.arm.fedoraproject.org buildvm-aarch64-02.arm.fedoraproject.org buildvm-aarch64-03.arm.fedoraproject.org @@ -81,7 +81,7 @@ buildvm-aarch64-21.arm.fedoraproject.org #buildvm-aarch64-23.arm.fedoraproject.org #buildvm-aarch64-24.arm.fedoraproject.org -[buildvm-armv7] +[buildvm_armv7] buildvm-armv7-01.arm.fedoraproject.org buildvm-armv7-02.arm.fedoraproject.org buildvm-armv7-03.arm.fedoraproject.org @@ -107,7 +107,7 @@ buildvm-armv7-22.arm.fedoraproject.org buildvm-armv7-23.arm.fedoraproject.org buildvm-armv7-24.arm.fedoraproject.org -[buildvm-s390x] +[buildvm_s390x] buildvm-s390x-01.s390.fedoraproject.org buildvm-s390x-02.s390.fedoraproject.org buildvm-s390x-03.s390.fedoraproject.org @@ -190,7 +190,7 @@ buildhw-aarch64-08.arm.fedoraproject.org # # These are primary koji builders. # -[buildvm-ppc64] +[buildvm_ppc64] buildvm-ppc64-01.ppc.fedoraproject.org buildvm-ppc64-02.ppc.fedoraproject.org buildvm-ppc64-03.ppc.fedoraproject.org @@ -204,7 +204,7 @@ buildvm-ppc64-09.ppc.fedoraproject.org # # These are primary koji builders. # -[buildvm-ppc64le] +[buildvm_ppc64le] buildvm-ppc64le-01.ppc.fedoraproject.org buildvm-ppc64le-02.ppc.fedoraproject.org buildvm-ppc64le-03.ppc.fedoraproject.org @@ -305,7 +305,7 @@ buildvm-ppc64le buildvm-s390x bkernel -[builders-stg:children] +[builders_stg:children] buildvm-stg buildvm-ppc64-stg buildvm-ppc64le-stg diff --git a/inventory/group_vars/aarch64-test b/inventory/group_vars/aarch64_test similarity index 100% rename from inventory/group_vars/aarch64-test rename to inventory/group_vars/aarch64_test diff --git a/inventory/group_vars/arm-packager b/inventory/group_vars/arm_packager similarity index 100% rename from inventory/group_vars/arm-packager rename to inventory/group_vars/arm_packager diff --git a/inventory/group_vars/arm-qa b/inventory/group_vars/arm_qa similarity index 100% rename from inventory/group_vars/arm-qa rename to inventory/group_vars/arm_qa diff --git a/inventory/group_vars/autocloud-backend b/inventory/group_vars/autocloud_backend similarity index 100% rename from inventory/group_vars/autocloud-backend rename to inventory/group_vars/autocloud_backend diff --git a/inventory/group_vars/autocloud-backend-stg b/inventory/group_vars/autocloud_backend_stg similarity index 100% rename from inventory/group_vars/autocloud-backend-stg rename to inventory/group_vars/autocloud_backend_stg diff --git a/inventory/group_vars/autocloud-web b/inventory/group_vars/autocloud_web similarity index 100% rename from inventory/group_vars/autocloud-web rename to inventory/group_vars/autocloud_web diff --git a/inventory/group_vars/autocloud-web-stg b/inventory/group_vars/autocloud_web_stg similarity index 100% rename from inventory/group_vars/autocloud-web-stg rename to inventory/group_vars/autocloud_web_stg diff --git a/inventory/group_vars/autosign-hardware b/inventory/group_vars/autosign_hardware similarity index 100% rename from inventory/group_vars/autosign-hardware rename to inventory/group_vars/autosign_hardware diff --git a/inventory/group_vars/badges-backend b/inventory/group_vars/badges_backend similarity index 100% rename from inventory/group_vars/badges-backend rename to inventory/group_vars/badges_backend diff --git a/inventory/group_vars/badges-backend-stg b/inventory/group_vars/badges_backend_stg similarity index 100% rename from inventory/group_vars/badges-backend-stg rename to inventory/group_vars/badges_backend_stg diff --git a/inventory/group_vars/badges-web b/inventory/group_vars/badges_web similarity index 100% rename from inventory/group_vars/badges-web rename to inventory/group_vars/badges_web diff --git a/inventory/group_vars/badges-web-stg b/inventory/group_vars/badges_web_stg similarity index 100% rename from inventory/group_vars/badges-web-stg rename to inventory/group_vars/badges_web_stg diff --git a/inventory/group_vars/basset-stg b/inventory/group_vars/basset_stg similarity index 100% rename from inventory/group_vars/basset-stg rename to inventory/group_vars/basset_stg diff --git a/inventory/group_vars/beaker-stg b/inventory/group_vars/beaker_stg similarity index 100% rename from inventory/group_vars/beaker-stg rename to inventory/group_vars/beaker_stg diff --git a/inventory/group_vars/beaker-virthosts b/inventory/group_vars/beaker_virthosts similarity index 100% rename from inventory/group_vars/beaker-virthosts rename to inventory/group_vars/beaker_virthosts diff --git a/inventory/group_vars/blockerbugs-stg b/inventory/group_vars/blockerbugs_stg similarity index 100% rename from inventory/group_vars/blockerbugs-stg rename to inventory/group_vars/blockerbugs_stg diff --git a/inventory/group_vars/bodhi2-stg b/inventory/group_vars/bodhi2_stg similarity index 100% rename from inventory/group_vars/bodhi2-stg rename to inventory/group_vars/bodhi2_stg diff --git a/inventory/group_vars/bodhi-backend b/inventory/group_vars/bodhi_backend similarity index 100% rename from inventory/group_vars/bodhi-backend rename to inventory/group_vars/bodhi_backend diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi_backend_stg similarity index 100% rename from inventory/group_vars/bodhi-backend-stg rename to inventory/group_vars/bodhi_backend_stg diff --git a/inventory/group_vars/bugyou-stg b/inventory/group_vars/bugyou_stg similarity index 100% rename from inventory/group_vars/bugyou-stg rename to inventory/group_vars/bugyou_stg diff --git a/inventory/group_vars/bugzilla2fedmsg-stg b/inventory/group_vars/bugzilla2fedmsg_stg similarity index 100% rename from inventory/group_vars/bugzilla2fedmsg-stg rename to inventory/group_vars/bugzilla2fedmsg_stg diff --git a/inventory/group_vars/buildarm-stg b/inventory/group_vars/buildarm_stg similarity index 100% rename from inventory/group_vars/buildarm-stg rename to inventory/group_vars/buildarm_stg diff --git a/inventory/group_vars/builders-stg b/inventory/group_vars/builders_stg similarity index 100% rename from inventory/group_vars/builders-stg rename to inventory/group_vars/builders_stg diff --git a/inventory/group_vars/buildvm-aarch64 b/inventory/group_vars/buildvm_aarch64 similarity index 100% rename from inventory/group_vars/buildvm-aarch64 rename to inventory/group_vars/buildvm_aarch64 diff --git a/inventory/group_vars/buildvm-aarch64-stg b/inventory/group_vars/buildvm_aarch64_stg similarity index 100% rename from inventory/group_vars/buildvm-aarch64-stg rename to inventory/group_vars/buildvm_aarch64_stg diff --git a/inventory/group_vars/buildvm-armv7 b/inventory/group_vars/buildvm_armv7 similarity index 100% rename from inventory/group_vars/buildvm-armv7 rename to inventory/group_vars/buildvm_armv7 diff --git a/inventory/group_vars/buildvm-armv7-stg b/inventory/group_vars/buildvm_armv7_stg similarity index 100% rename from inventory/group_vars/buildvm-armv7-stg rename to inventory/group_vars/buildvm_armv7_stg diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm_ppc64 similarity index 100% rename from inventory/group_vars/buildvm-ppc64 rename to inventory/group_vars/buildvm_ppc64 diff --git a/inventory/group_vars/buildvm-ppc64-stg b/inventory/group_vars/buildvm_ppc64_stg similarity index 100% rename from inventory/group_vars/buildvm-ppc64-stg rename to inventory/group_vars/buildvm_ppc64_stg diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm_ppc64le similarity index 100% rename from inventory/group_vars/buildvm-ppc64le rename to inventory/group_vars/buildvm_ppc64le diff --git a/inventory/group_vars/buildvm-ppc64le-stg b/inventory/group_vars/buildvm_ppc64le_stg similarity index 100% rename from inventory/group_vars/buildvm-ppc64le-stg rename to inventory/group_vars/buildvm_ppc64le_stg diff --git a/inventory/group_vars/buildvm-s390x b/inventory/group_vars/buildvm_s390x similarity index 100% rename from inventory/group_vars/buildvm-s390x rename to inventory/group_vars/buildvm_s390x diff --git a/inventory/group_vars/buildvm-s390x-stg b/inventory/group_vars/buildvm_s390x_stg similarity index 100% rename from inventory/group_vars/buildvm-s390x-stg rename to inventory/group_vars/buildvm_s390x_stg diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm_stg similarity index 100% rename from inventory/group_vars/buildvm-stg rename to inventory/group_vars/buildvm_stg diff --git a/inventory/group_vars/busgateway-stg b/inventory/group_vars/busgateway_stg similarity index 100% rename from inventory/group_vars/busgateway-stg rename to inventory/group_vars/busgateway_stg diff --git a/inventory/group_vars/cloud-hardware b/inventory/group_vars/cloud_hardware similarity index 100% rename from inventory/group_vars/cloud-hardware rename to inventory/group_vars/cloud_hardware diff --git a/inventory/group_vars/colo-virt b/inventory/group_vars/colo_virt similarity index 100% rename from inventory/group_vars/colo-virt rename to inventory/group_vars/colo_virt diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr_back similarity index 100% rename from inventory/group_vars/copr-back rename to inventory/group_vars/copr_back diff --git a/inventory/group_vars/copr-back-dev b/inventory/group_vars/copr_back_dev similarity index 100% rename from inventory/group_vars/copr-back-dev rename to inventory/group_vars/copr_back_dev diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr_back_stg similarity index 100% rename from inventory/group_vars/copr-back-stg rename to inventory/group_vars/copr_back_stg diff --git a/inventory/group_vars/copr-dev b/inventory/group_vars/copr_dev similarity index 100% rename from inventory/group_vars/copr-dev rename to inventory/group_vars/copr_dev diff --git a/inventory/group_vars/copr-dist-git b/inventory/group_vars/copr_dist_git similarity index 100% rename from inventory/group_vars/copr-dist-git rename to inventory/group_vars/copr_dist_git diff --git a/inventory/group_vars/copr-dist-git-dev b/inventory/group_vars/copr_dist_git_dev similarity index 100% rename from inventory/group_vars/copr-dist-git-dev rename to inventory/group_vars/copr_dist_git_dev diff --git a/inventory/group_vars/copr-dist-git-stg b/inventory/group_vars/copr_dist_git_stg similarity index 100% rename from inventory/group_vars/copr-dist-git-stg rename to inventory/group_vars/copr_dist_git_stg diff --git a/inventory/group_vars/copr-front b/inventory/group_vars/copr_front similarity index 100% rename from inventory/group_vars/copr-front rename to inventory/group_vars/copr_front diff --git a/inventory/group_vars/copr-front-dev b/inventory/group_vars/copr_front_dev similarity index 100% rename from inventory/group_vars/copr-front-dev rename to inventory/group_vars/copr_front_dev diff --git a/inventory/group_vars/copr-front-stg b/inventory/group_vars/copr_front_stg similarity index 100% rename from inventory/group_vars/copr-front-stg rename to inventory/group_vars/copr_front_stg diff --git a/inventory/group_vars/copr-keygen b/inventory/group_vars/copr_keygen similarity index 100% rename from inventory/group_vars/copr-keygen rename to inventory/group_vars/copr_keygen diff --git a/inventory/group_vars/copr-keygen-dev b/inventory/group_vars/copr_keygen_dev similarity index 100% rename from inventory/group_vars/copr-keygen-dev rename to inventory/group_vars/copr_keygen_dev diff --git a/inventory/group_vars/copr-keygen-stg b/inventory/group_vars/copr_keygen_stg similarity index 100% rename from inventory/group_vars/copr-keygen-stg rename to inventory/group_vars/copr_keygen_stg diff --git a/inventory/group_vars/copr-stg b/inventory/group_vars/copr_stg similarity index 100% rename from inventory/group_vars/copr-stg rename to inventory/group_vars/copr_stg diff --git a/inventory/group_vars/datagrepper-stg b/inventory/group_vars/datagrepper_stg similarity index 100% rename from inventory/group_vars/datagrepper-stg rename to inventory/group_vars/datagrepper_stg diff --git a/inventory/group_vars/dell-fx-build b/inventory/group_vars/dell_fx_build similarity index 100% rename from inventory/group_vars/dell-fx-build rename to inventory/group_vars/dell_fx_build diff --git a/inventory/group_vars/download-ib b/inventory/group_vars/download_ib similarity index 100% rename from inventory/group_vars/download-ib rename to inventory/group_vars/download_ib diff --git a/inventory/group_vars/download-phx2 b/inventory/group_vars/download_phx2 similarity index 100% rename from inventory/group_vars/download-phx2 rename to inventory/group_vars/download_phx2 diff --git a/inventory/group_vars/download-rdu2 b/inventory/group_vars/download_rdu2 similarity index 100% rename from inventory/group_vars/download-rdu2 rename to inventory/group_vars/download_rdu2 diff --git a/inventory/group_vars/elections-stg b/inventory/group_vars/elections_stg similarity index 100% rename from inventory/group_vars/elections-stg rename to inventory/group_vars/elections_stg diff --git a/inventory/group_vars/faf-stg b/inventory/group_vars/faf_stg similarity index 100% rename from inventory/group_vars/faf-stg rename to inventory/group_vars/faf_stg diff --git a/inventory/group_vars/fas-stg b/inventory/group_vars/fas_stg similarity index 100% rename from inventory/group_vars/fas-stg rename to inventory/group_vars/fas_stg diff --git a/inventory/group_vars/fedimg-stg b/inventory/group_vars/fedimg_stg similarity index 100% rename from inventory/group_vars/fedimg-stg rename to inventory/group_vars/fedimg_stg diff --git a/inventory/group_vars/fedocal-stg b/inventory/group_vars/fedocal_stg similarity index 100% rename from inventory/group_vars/fedocal-stg rename to inventory/group_vars/fedocal_stg diff --git a/inventory/group_vars/freshmaker-backend b/inventory/group_vars/freshmaker_backend similarity index 100% rename from inventory/group_vars/freshmaker-backend rename to inventory/group_vars/freshmaker_backend diff --git a/inventory/group_vars/freshmaker-backend-stg b/inventory/group_vars/freshmaker_backend_stg similarity index 100% rename from inventory/group_vars/freshmaker-backend-stg rename to inventory/group_vars/freshmaker_backend_stg diff --git a/inventory/group_vars/freshmaker-frontend b/inventory/group_vars/freshmaker_frontend similarity index 100% rename from inventory/group_vars/freshmaker-frontend rename to inventory/group_vars/freshmaker_frontend diff --git a/inventory/group_vars/freshmaker-frontend-stg b/inventory/group_vars/freshmaker_frontend_stg similarity index 100% rename from inventory/group_vars/freshmaker-frontend-stg rename to inventory/group_vars/freshmaker_frontend_stg diff --git a/inventory/group_vars/freshmaker-stg b/inventory/group_vars/freshmaker_stg similarity index 100% rename from inventory/group_vars/freshmaker-stg rename to inventory/group_vars/freshmaker_stg diff --git a/inventory/group_vars/github2fedmsg-stg b/inventory/group_vars/github2fedmsg_stg similarity index 100% rename from inventory/group_vars/github2fedmsg-stg rename to inventory/group_vars/github2fedmsg_stg diff --git a/inventory/group_vars/gnome-backups b/inventory/group_vars/gnome_backups similarity index 100% rename from inventory/group_vars/gnome-backups rename to inventory/group_vars/gnome_backups diff --git a/inventory/group_vars/greenwave-stg b/inventory/group_vars/greenwave_stg similarity index 100% rename from inventory/group_vars/greenwave-stg rename to inventory/group_vars/greenwave_stg diff --git a/inventory/group_vars/hotness-stg b/inventory/group_vars/hotness_stg similarity index 100% rename from inventory/group_vars/hotness-stg rename to inventory/group_vars/hotness_stg diff --git a/inventory/group_vars/ipa-stg b/inventory/group_vars/ipa_stg similarity index 100% rename from inventory/group_vars/ipa-stg rename to inventory/group_vars/ipa_stg diff --git a/inventory/group_vars/kernel-qa b/inventory/group_vars/kernel_qa similarity index 100% rename from inventory/group_vars/kernel-qa rename to inventory/group_vars/kernel_qa diff --git a/inventory/group_vars/kerneltest-stg b/inventory/group_vars/kerneltest_stg similarity index 100% rename from inventory/group_vars/kerneltest-stg rename to inventory/group_vars/kerneltest_stg diff --git a/inventory/group_vars/koji-not-yet-ansibilized b/inventory/group_vars/koji_not_yet_ansibilized similarity index 100% rename from inventory/group_vars/koji-not-yet-ansibilized rename to inventory/group_vars/koji_not_yet_ansibilized diff --git a/inventory/group_vars/koji-stg b/inventory/group_vars/koji_stg similarity index 100% rename from inventory/group_vars/koji-stg rename to inventory/group_vars/koji_stg diff --git a/inventory/group_vars/koschei-backend b/inventory/group_vars/koschei_backend similarity index 100% rename from inventory/group_vars/koschei-backend rename to inventory/group_vars/koschei_backend diff --git a/inventory/group_vars/koschei-backend-stg b/inventory/group_vars/koschei_backend_stg similarity index 100% rename from inventory/group_vars/koschei-backend-stg rename to inventory/group_vars/koschei_backend_stg diff --git a/inventory/group_vars/koschei-web b/inventory/group_vars/koschei_web similarity index 100% rename from inventory/group_vars/koschei-web rename to inventory/group_vars/koschei_web diff --git a/inventory/group_vars/koschei-web-stg b/inventory/group_vars/koschei_web_stg similarity index 100% rename from inventory/group_vars/koschei-web-stg rename to inventory/group_vars/koschei_web_stg diff --git a/inventory/group_vars/libravatar-stg b/inventory/group_vars/libravatar_stg similarity index 100% rename from inventory/group_vars/libravatar-stg rename to inventory/group_vars/libravatar_stg diff --git a/inventory/group_vars/loopabull-stg b/inventory/group_vars/loopabull_stg similarity index 100% rename from inventory/group_vars/loopabull-stg rename to inventory/group_vars/loopabull_stg diff --git a/inventory/group_vars/mailman-stg b/inventory/group_vars/mailman_stg similarity index 100% rename from inventory/group_vars/mailman-stg rename to inventory/group_vars/mailman_stg diff --git a/inventory/group_vars/maintainer-test b/inventory/group_vars/maintainer_test similarity index 100% rename from inventory/group_vars/maintainer-test rename to inventory/group_vars/maintainer_test diff --git a/inventory/group_vars/mbs-backend b/inventory/group_vars/mbs_backend similarity index 100% rename from inventory/group_vars/mbs-backend rename to inventory/group_vars/mbs_backend diff --git a/inventory/group_vars/mbs-backend-stg b/inventory/group_vars/mbs_backend_stg similarity index 100% rename from inventory/group_vars/mbs-backend-stg rename to inventory/group_vars/mbs_backend_stg diff --git a/inventory/group_vars/mbs-frontend b/inventory/group_vars/mbs_frontend similarity index 100% rename from inventory/group_vars/mbs-frontend rename to inventory/group_vars/mbs_frontend diff --git a/inventory/group_vars/mbs-frontend-stg b/inventory/group_vars/mbs_frontend_stg similarity index 100% rename from inventory/group_vars/mbs-frontend-stg rename to inventory/group_vars/mbs_frontend_stg diff --git a/inventory/group_vars/mdapi-stg b/inventory/group_vars/mdapi_stg similarity index 100% rename from inventory/group_vars/mdapi-stg rename to inventory/group_vars/mdapi_stg diff --git a/inventory/group_vars/memcached-stg b/inventory/group_vars/memcached_stg similarity index 100% rename from inventory/group_vars/memcached-stg rename to inventory/group_vars/memcached_stg diff --git a/inventory/group_vars/mirrorlist2-stg b/inventory/group_vars/mirrorlist2_stg similarity index 100% rename from inventory/group_vars/mirrorlist2-stg rename to inventory/group_vars/mirrorlist2_stg diff --git a/inventory/group_vars/mm-backend b/inventory/group_vars/mm_backend similarity index 100% rename from inventory/group_vars/mm-backend rename to inventory/group_vars/mm_backend diff --git a/inventory/group_vars/mm-backend-stg b/inventory/group_vars/mm_backend_stg similarity index 100% rename from inventory/group_vars/mm-backend-stg rename to inventory/group_vars/mm_backend_stg diff --git a/inventory/group_vars/mm-crawler b/inventory/group_vars/mm_crawler similarity index 100% rename from inventory/group_vars/mm-crawler rename to inventory/group_vars/mm_crawler diff --git a/inventory/group_vars/mm-crawler-stg b/inventory/group_vars/mm_crawler_stg similarity index 100% rename from inventory/group_vars/mm-crawler-stg rename to inventory/group_vars/mm_crawler_stg diff --git a/inventory/group_vars/mm-frontend b/inventory/group_vars/mm_frontend similarity index 100% rename from inventory/group_vars/mm-frontend rename to inventory/group_vars/mm_frontend diff --git a/inventory/group_vars/mm-frontend-stg b/inventory/group_vars/mm_frontend_stg similarity index 100% rename from inventory/group_vars/mm-frontend-stg rename to inventory/group_vars/mm_frontend_stg diff --git a/inventory/group_vars/mm-stg b/inventory/group_vars/mm_stg similarity index 100% rename from inventory/group_vars/mm-stg rename to inventory/group_vars/mm_stg diff --git a/inventory/group_vars/notifs-backend b/inventory/group_vars/notifs_backend similarity index 100% rename from inventory/group_vars/notifs-backend rename to inventory/group_vars/notifs_backend diff --git a/inventory/group_vars/notifs-backend-stg b/inventory/group_vars/notifs_backend_stg similarity index 100% rename from inventory/group_vars/notifs-backend-stg rename to inventory/group_vars/notifs_backend_stg diff --git a/inventory/group_vars/notifs-web b/inventory/group_vars/notifs_web similarity index 100% rename from inventory/group_vars/notifs-web rename to inventory/group_vars/notifs_web diff --git a/inventory/group_vars/notifs-web-stg b/inventory/group_vars/notifs_web_stg similarity index 100% rename from inventory/group_vars/notifs-web-stg rename to inventory/group_vars/notifs_web_stg diff --git a/inventory/group_vars/nuancier-stg b/inventory/group_vars/nuancier_stg similarity index 100% rename from inventory/group_vars/nuancier-stg rename to inventory/group_vars/nuancier_stg diff --git a/inventory/group_vars/oci-registry b/inventory/group_vars/oci_registry similarity index 100% rename from inventory/group_vars/oci-registry rename to inventory/group_vars/oci_registry diff --git a/inventory/group_vars/oci-registry-stg b/inventory/group_vars/oci_registry_stg similarity index 100% rename from inventory/group_vars/oci-registry-stg rename to inventory/group_vars/oci_registry_stg diff --git a/inventory/group_vars/odcs-backend b/inventory/group_vars/odcs_backend similarity index 100% rename from inventory/group_vars/odcs-backend rename to inventory/group_vars/odcs_backend diff --git a/inventory/group_vars/odcs-backend-stg b/inventory/group_vars/odcs_backend_stg similarity index 100% rename from inventory/group_vars/odcs-backend-stg rename to inventory/group_vars/odcs_backend_stg diff --git a/inventory/group_vars/odcs-frontend b/inventory/group_vars/odcs_frontend similarity index 100% rename from inventory/group_vars/odcs-frontend rename to inventory/group_vars/odcs_frontend diff --git a/inventory/group_vars/odcs-frontend-stg b/inventory/group_vars/odcs_frontend_stg similarity index 100% rename from inventory/group_vars/odcs-frontend-stg rename to inventory/group_vars/odcs_frontend_stg diff --git a/inventory/group_vars/openqa-stg b/inventory/group_vars/openqa_stg similarity index 100% rename from inventory/group_vars/openqa-stg rename to inventory/group_vars/openqa_stg diff --git a/inventory/group_vars/openqa-stg-workers b/inventory/group_vars/openqa_stg_workers similarity index 100% rename from inventory/group_vars/openqa-stg-workers rename to inventory/group_vars/openqa_stg_workers diff --git a/inventory/group_vars/openqa-tap-workers b/inventory/group_vars/openqa_tap_workers similarity index 100% rename from inventory/group_vars/openqa-tap-workers rename to inventory/group_vars/openqa_tap_workers diff --git a/inventory/group_vars/openqa-workers b/inventory/group_vars/openqa_workers similarity index 100% rename from inventory/group_vars/openqa-workers rename to inventory/group_vars/openqa_workers diff --git a/inventory/group_vars/openshift-pseudohosts-stg b/inventory/group_vars/openshift_pseudohosts_stg similarity index 100% rename from inventory/group_vars/openshift-pseudohosts-stg rename to inventory/group_vars/openshift_pseudohosts_stg diff --git a/inventory/group_vars/openstack-compute b/inventory/group_vars/openstack_compute similarity index 100% rename from inventory/group_vars/openstack-compute rename to inventory/group_vars/openstack_compute diff --git a/inventory/group_vars/os-control b/inventory/group_vars/os_control similarity index 100% rename from inventory/group_vars/os-control rename to inventory/group_vars/os_control diff --git a/inventory/group_vars/os-control-stg b/inventory/group_vars/os_control_stg similarity index 100% rename from inventory/group_vars/os-control-stg rename to inventory/group_vars/os_control_stg diff --git a/inventory/group_vars/os-masters b/inventory/group_vars/os_masters similarity index 100% rename from inventory/group_vars/os-masters rename to inventory/group_vars/os_masters diff --git a/inventory/group_vars/os-masters-stg b/inventory/group_vars/os_masters_stg similarity index 100% rename from inventory/group_vars/os-masters-stg rename to inventory/group_vars/os_masters_stg diff --git a/inventory/group_vars/os-nodes b/inventory/group_vars/os_nodes similarity index 100% rename from inventory/group_vars/os-nodes rename to inventory/group_vars/os_nodes diff --git a/inventory/group_vars/os-nodes-stg b/inventory/group_vars/os_nodes_stg similarity index 100% rename from inventory/group_vars/os-nodes-stg rename to inventory/group_vars/os_nodes_stg diff --git a/inventory/group_vars/os-proxies b/inventory/group_vars/os_proxies similarity index 100% rename from inventory/group_vars/os-proxies rename to inventory/group_vars/os_proxies diff --git a/inventory/group_vars/os-stg b/inventory/group_vars/os_stg similarity index 100% rename from inventory/group_vars/os-stg rename to inventory/group_vars/os_stg diff --git a/inventory/group_vars/osbs-aarch64-masters b/inventory/group_vars/osbs_aarch64_masters similarity index 100% rename from inventory/group_vars/osbs-aarch64-masters rename to inventory/group_vars/osbs_aarch64_masters diff --git a/inventory/group_vars/osbs-aarch64-masters-stg b/inventory/group_vars/osbs_aarch64_masters_stg similarity index 100% rename from inventory/group_vars/osbs-aarch64-masters-stg rename to inventory/group_vars/osbs_aarch64_masters_stg diff --git a/inventory/group_vars/osbs-aarch64-nodes-stg b/inventory/group_vars/osbs_aarch64_nodes_stg similarity index 100% rename from inventory/group_vars/osbs-aarch64-nodes-stg rename to inventory/group_vars/osbs_aarch64_nodes_stg diff --git a/inventory/group_vars/osbs-control b/inventory/group_vars/osbs_control similarity index 100% rename from inventory/group_vars/osbs-control rename to inventory/group_vars/osbs_control diff --git a/inventory/group_vars/osbs-control-stg b/inventory/group_vars/osbs_control_stg similarity index 100% rename from inventory/group_vars/osbs-control-stg rename to inventory/group_vars/osbs_control_stg diff --git a/inventory/group_vars/osbs-masters b/inventory/group_vars/osbs_masters similarity index 100% rename from inventory/group_vars/osbs-masters rename to inventory/group_vars/osbs_masters diff --git a/inventory/group_vars/osbs-masters-stg b/inventory/group_vars/osbs_masters_stg similarity index 100% rename from inventory/group_vars/osbs-masters-stg rename to inventory/group_vars/osbs_masters_stg diff --git a/inventory/group_vars/osbs-nodes b/inventory/group_vars/osbs_nodes similarity index 100% rename from inventory/group_vars/osbs-nodes rename to inventory/group_vars/osbs_nodes diff --git a/inventory/group_vars/osbs-nodes-stg b/inventory/group_vars/osbs_nodes_stg similarity index 100% rename from inventory/group_vars/osbs-nodes-stg rename to inventory/group_vars/osbs_nodes_stg diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs_stg similarity index 100% rename from inventory/group_vars/osbs-stg rename to inventory/group_vars/osbs_stg diff --git a/inventory/group_vars/packages-stg b/inventory/group_vars/packages_stg similarity index 100% rename from inventory/group_vars/packages-stg rename to inventory/group_vars/packages_stg diff --git a/inventory/group_vars/pagure-proxy b/inventory/group_vars/pagure_proxy similarity index 100% rename from inventory/group_vars/pagure-proxy rename to inventory/group_vars/pagure_proxy diff --git a/inventory/group_vars/pagure-stg b/inventory/group_vars/pagure_stg similarity index 100% rename from inventory/group_vars/pagure-stg rename to inventory/group_vars/pagure_stg diff --git a/inventory/group_vars/pdc-backend b/inventory/group_vars/pdc_backend similarity index 100% rename from inventory/group_vars/pdc-backend rename to inventory/group_vars/pdc_backend diff --git a/inventory/group_vars/pdc-backend-stg b/inventory/group_vars/pdc_backend_stg similarity index 100% rename from inventory/group_vars/pdc-backend-stg rename to inventory/group_vars/pdc_backend_stg diff --git a/inventory/group_vars/pdc-web b/inventory/group_vars/pdc_web similarity index 100% rename from inventory/group_vars/pdc-web rename to inventory/group_vars/pdc_web diff --git a/inventory/group_vars/pdc-web-stg b/inventory/group_vars/pdc_web_stg similarity index 100% rename from inventory/group_vars/pdc-web-stg rename to inventory/group_vars/pdc_web_stg diff --git a/inventory/group_vars/persistent-cloud b/inventory/group_vars/persistent_cloud similarity index 100% rename from inventory/group_vars/persistent-cloud rename to inventory/group_vars/persistent_cloud diff --git a/inventory/group_vars/piwik-stg b/inventory/group_vars/piwik_stg similarity index 100% rename from inventory/group_vars/piwik-stg rename to inventory/group_vars/piwik_stg diff --git a/inventory/group_vars/pkgs-stg b/inventory/group_vars/pkgs_stg similarity index 100% rename from inventory/group_vars/pkgs-stg rename to inventory/group_vars/pkgs_stg diff --git a/inventory/group_vars/postgresql-server b/inventory/group_vars/postgresql_server similarity index 100% rename from inventory/group_vars/postgresql-server rename to inventory/group_vars/postgresql_server diff --git a/inventory/group_vars/proxies-stg b/inventory/group_vars/proxies_stg similarity index 100% rename from inventory/group_vars/proxies-stg rename to inventory/group_vars/proxies_stg diff --git a/inventory/group_vars/qa-prod b/inventory/group_vars/qa_prod similarity index 100% rename from inventory/group_vars/qa-prod rename to inventory/group_vars/qa_prod diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa_stg similarity index 100% rename from inventory/group_vars/qa-stg rename to inventory/group_vars/qa_stg diff --git a/inventory/group_vars/rabbitmq-stg b/inventory/group_vars/rabbitmq_stg similarity index 100% rename from inventory/group_vars/rabbitmq-stg rename to inventory/group_vars/rabbitmq_stg diff --git a/inventory/group_vars/releng-compose b/inventory/group_vars/releng_compose similarity index 100% rename from inventory/group_vars/releng-compose rename to inventory/group_vars/releng_compose diff --git a/inventory/group_vars/releng-stg b/inventory/group_vars/releng_stg similarity index 100% rename from inventory/group_vars/releng-stg rename to inventory/group_vars/releng_stg diff --git a/inventory/group_vars/relvalconsumer-test b/inventory/group_vars/relvalconsumer_test similarity index 100% rename from inventory/group_vars/relvalconsumer-test rename to inventory/group_vars/relvalconsumer_test diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb_dev similarity index 100% rename from inventory/group_vars/resultsdb-dev rename to inventory/group_vars/resultsdb_dev diff --git a/inventory/group_vars/resultsdb-prod b/inventory/group_vars/resultsdb_prod similarity index 100% rename from inventory/group_vars/resultsdb-prod rename to inventory/group_vars/resultsdb_prod diff --git a/inventory/group_vars/resultsdb-stg b/inventory/group_vars/resultsdb_stg similarity index 100% rename from inventory/group_vars/resultsdb-stg rename to inventory/group_vars/resultsdb_stg diff --git a/inventory/group_vars/retrace-stg b/inventory/group_vars/retrace_stg similarity index 100% rename from inventory/group_vars/retrace-stg rename to inventory/group_vars/retrace_stg diff --git a/inventory/group_vars/sign-bridge b/inventory/group_vars/sign_bridge similarity index 100% rename from inventory/group_vars/sign-bridge rename to inventory/group_vars/sign_bridge diff --git a/inventory/group_vars/sign-vault b/inventory/group_vars/sign_vault similarity index 100% rename from inventory/group_vars/sign-vault rename to inventory/group_vars/sign_vault diff --git a/inventory/group_vars/smtp-mm b/inventory/group_vars/smtp_mm similarity index 100% rename from inventory/group_vars/smtp-mm rename to inventory/group_vars/smtp_mm diff --git a/inventory/group_vars/sundries-stg b/inventory/group_vars/sundries_stg similarity index 100% rename from inventory/group_vars/sundries-stg rename to inventory/group_vars/sundries_stg diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron_dev similarity index 100% rename from inventory/group_vars/taskotron-dev rename to inventory/group_vars/taskotron_dev diff --git a/inventory/group_vars/taskotron-dev-client-hosts b/inventory/group_vars/taskotron_dev_client_hosts similarity index 100% rename from inventory/group_vars/taskotron-dev-client-hosts rename to inventory/group_vars/taskotron_dev_client_hosts diff --git a/inventory/group_vars/taskotron-prod b/inventory/group_vars/taskotron_prod similarity index 100% rename from inventory/group_vars/taskotron-prod rename to inventory/group_vars/taskotron_prod diff --git a/inventory/group_vars/taskotron-prod-client-hosts b/inventory/group_vars/taskotron_prod_client_hosts similarity index 100% rename from inventory/group_vars/taskotron-prod-client-hosts rename to inventory/group_vars/taskotron_prod_client_hosts diff --git a/inventory/group_vars/taskotron-stg b/inventory/group_vars/taskotron_stg similarity index 100% rename from inventory/group_vars/taskotron-stg rename to inventory/group_vars/taskotron_stg diff --git a/inventory/group_vars/taskotron-stg-client-hosts b/inventory/group_vars/taskotron_stg_client_hosts similarity index 100% rename from inventory/group_vars/taskotron-stg-client-hosts rename to inventory/group_vars/taskotron_stg_client_hosts diff --git a/inventory/group_vars/twisted-buildbots b/inventory/group_vars/twisted_buildbots similarity index 100% rename from inventory/group_vars/twisted-buildbots rename to inventory/group_vars/twisted_buildbots diff --git a/inventory/group_vars/value-stg b/inventory/group_vars/value_stg similarity index 100% rename from inventory/group_vars/value-stg rename to inventory/group_vars/value_stg diff --git a/inventory/group_vars/virthost-comm b/inventory/group_vars/virthost_comm similarity index 100% rename from inventory/group_vars/virthost-comm rename to inventory/group_vars/virthost_comm diff --git a/inventory/group_vars/virthost-communishift b/inventory/group_vars/virthost_communishift similarity index 100% rename from inventory/group_vars/virthost-communishift rename to inventory/group_vars/virthost_communishift diff --git a/inventory/group_vars/waiverdb-stg b/inventory/group_vars/waiverdb_stg similarity index 100% rename from inventory/group_vars/waiverdb-stg rename to inventory/group_vars/waiverdb_stg diff --git a/inventory/group_vars/wiki-stg b/inventory/group_vars/wiki_stg similarity index 100% rename from inventory/group_vars/wiki-stg rename to inventory/group_vars/wiki_stg diff --git a/inventory/group_vars/zanata2fedmsg-stg b/inventory/group_vars/zanata2fedmsg_stg similarity index 100% rename from inventory/group_vars/zanata2fedmsg-stg rename to inventory/group_vars/zanata2fedmsg_stg diff --git a/inventory/inventory b/inventory/inventory index eaef917e53..de9faacd73 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1,25 +1,25 @@ [beaker] beaker01.qa.fedoraproject.org -[beaker-stg] +[beaker_stg] beaker-stg01.qa.fedoraproject.org [grobisplitter] grobisplitter01.phx2.fedoraproject.org -[beaker-virthosts] +[beaker_virthosts] -[qa-prod] +[qa_prod] qa-prod01.qa.fedoraproject.org -[qa-stg] +[qa_stg] qa-stg01.qa.fedoraproject.org:222 -[arm-packager] +[arm_packager] arm03-packager00.cloud.fedoraproject.org arm03-packager01.cloud.fedoraproject.org -[arm-qa] +[arm_qa] arm03-qa00.cloud.fedoraproject.org arm03-qa01.cloud.fedoraproject.org @@ -28,18 +28,18 @@ rabbitmq01.phx2.fedoraproject.org rabbitmq02.phx2.fedoraproject.org rabbitmq03.phx2.fedoraproject.org -[rabbitmq-stg] +[rabbitmq_stg] rabbitmq01.stg.phx2.fedoraproject.org rabbitmq02.stg.phx2.fedoraproject.org rabbitmq03.stg.phx2.fedoraproject.org -[releng-compose] +[releng_compose] compose-x86-01.phx2.fedoraproject.org branched-composer.phx2.fedoraproject.org rawhide-composer.phx2.fedoraproject.org compose-iot-01.phx2.fedoraproject.org -[releng-stg] +[releng_stg] composer.stg.phx2.fedoraproject.org [retrace] @@ -56,46 +56,46 @@ repospanner-osuosl01.fedoraproject.org [certgetter] certgetter01.phx2.fedoraproject.org -[freshmaker-frontend] +[freshmaker_frontend] freshmaker-frontend01.phx2.fedoraproject.org -[freshmaker-frontend-stg] +[freshmaker_frontend_stg] freshmaker-frontend01.stg.phx2.fedoraproject.org -[freshmaker-backend] +[freshmaker_backend] freshmaker-backend01.phx2.fedoraproject.org -[freshmaker-backend-stg] +[freshmaker_backend_stg] freshmaker-backend01.stg.phx2.fedoraproject.org -[freshmaker-stg:children] -freshmaker-frontend-stg -freshmaker-backend-stg +[freshmaker_stg:children] +freshmaker_frontend_stg +freshmaker_backend_stg [freshmaker:children] -freshmaker-frontend -freshmaker-backend +freshmaker_frontend +freshmaker_backend [backup] backup01.phx2.fedoraproject.org -[badges-backend] +[badges_backend] badges-backend01.phx2.fedoraproject.org -[badges-backend-stg] +[badges_backend_stg] badges-backend01.stg.phx2.fedoraproject.org -[badges-web] +[badges_web] badges-web01.phx2.fedoraproject.org badges-web02.phx2.fedoraproject.org -[badges-web-stg] +[badges_web_stg] badges-web01.stg.phx2.fedoraproject.org [basset] basset01.phx2.fedoraproject.org -[basset-stg] +[basset_stg] basset01.stg.phx2.fedoraproject.org [bastion] @@ -108,19 +108,19 @@ bastion13.fedoraproject.org blockerbugs01.phx2.fedoraproject.org blockerbugs02.phx2.fedoraproject.org -[blockerbugs-stg] +[blockerbugs_stg] blockerbugs01.stg.phx2.fedoraproject.org [bugyou] bugyou01.phx2.fedoraproject.org -[bugyou-stg] +[bugyou_stg] bugyou01.stg.phx2.fedoraproject.org [bugzilla2fedmsg] bugzilla2fedmsg01.phx2.fedoraproject.org -[bugzilla2fedmsg-stg] +[bugzilla2fedmsg_stg] bugzilla2fedmsg01.stg.phx2.fedoraproject.org [bvirthost] @@ -133,7 +133,7 @@ bvirthost13.phx2.fedoraproject.org bvirthost14.phx2.fedoraproject.org bvirthost15.phx2.fedoraproject.org -[colo-virt] +[colo_virt] coloamer01.fedoraproject.org dedicatedsolutions01.fedoraproject.org ibiblio01.fedoraproject.org @@ -153,67 +153,67 @@ virthost-cloud01.fedorainfracloud.org datagrepper01.phx2.fedoraproject.org datagrepper02.phx2.fedoraproject.org -[datagrepper-stg] +[datagrepper_stg] datagrepper01.stg.phx2.fedoraproject.org [fedimg] fedimg01.phx2.fedoraproject.org -[fedimg-stg] +[fedimg_stg] fedimg01.stg.phx2.fedoraproject.org [busgateway] busgateway01.phx2.fedoraproject.org -[busgateway-stg] +[busgateway_stg] busgateway01.stg.phx2.fedoraproject.org [fedocal] fedocal01.phx2.fedoraproject.org fedocal02.phx2.fedoraproject.org -[fedocal-stg] +[fedocal_stg] fedocal01.stg.phx2.fedoraproject.org [github2fedmsg] github2fedmsg01.phx2.fedoraproject.org -[github2fedmsg-stg] +[github2fedmsg_stg] github2fedmsg01.stg.phx2.fedoraproject.org [mailman] mailman01.phx2.fedoraproject.org mailman02.phx2.fedoraproject.org -[mailman-stg] +[mailman_stg] mailman01.stg.phx2.fedoraproject.org -[mbs-frontend] +[mbs_frontend] mbs-frontend01.phx2.fedoraproject.org mbs-frontend02.phx2.fedoraproject.org -[mbs-frontend-stg] +[mbs_frontend_stg] mbs-frontend01.stg.phx2.fedoraproject.org mbs-frontend02.stg.phx2.fedoraproject.org -[mbs-backend] +[mbs_backend] mbs-backend01.phx2.fedoraproject.org -[mbs-backend-stg] +[mbs_backend_stg] mbs-backend01.stg.phx2.fedoraproject.org [mbs:children] -mbs-frontend -mbs-backend +mbs_frontend +mbs_backend -[mbs-stg:children] -mbs-frontend-stg -mbs-backend-stg +[mbs_stg:children] +mbs_frontend_stg +mbs_backend_stg [mdapi] mdapi01.phx2.fedoraproject.org -[mdapi-stg] +[mdapi_stg] mdapi01.stg.phx2.fedoraproject.org [minimal] @@ -223,10 +223,10 @@ bkernel04.phx2.fedoraproject.org modernpaste01.phx2.fedoraproject.org modernpaste02.phx2.fedoraproject.org -[modernpaste-stg] +[modernpaste_stg] modernpaste01.stg.phx2.fedoraproject.org -[bodhi-backend] +[bodhi_backend] # This one handles the mashing/releng stuff bodhi-backend01.phx2.fedoraproject.org # This one handles the offline updates work like checking bugs, wiki test cases, @@ -234,56 +234,56 @@ bodhi-backend01.phx2.fedoraproject.org # faster. bodhi-backend02.phx2.fedoraproject.org -[bodhi-backend-stg] +[bodhi_backend_stg] bodhi-backend01.stg.phx2.fedoraproject.org -[sign-bridge] +[sign_bridge] sign-bridge01.phx2.fedoraproject.org sign-bridge01.stg.phx2.fedoraproject.org # # sign vault servers don't listen to ssh by default. # -[sign-vault] +[sign_vault] #sign-vault01.stg.phx2.fedoraproject.org #sign-vault05.phx2.fedoraproject.org #sign-vault06.phx2.fedoraproject.org -[autocloud-web] +[autocloud_web] autocloud-web01.phx2.fedoraproject.org autocloud-web02.phx2.fedoraproject.org -[autocloud-web-stg] +[autocloud_web_stg] autocloud-web01.stg.phx2.fedoraproject.org autocloud-web02.stg.phx2.fedoraproject.org -[autocloud-backend:children] -autocloud-backend-libvirt -autocloud-backend-vbox -autocloud-backend-aarch64 +[autocloud_backend:children] +autocloud_backend_libvirt +autocloud_backend_vbox +autocloud_backend_aarch64 -[autocloud-backend-libvirt] +[autocloud_backend_libvirt] autocloud-backend-libvirt2.phx2.fedoraproject.org -[autocloud-backend-vbox] +[autocloud_backend_vbox] autocloud-backend-vbox2.phx2.fedoraproject.org -[autocloud-backend-aarch64] +[autocloud_backend_aarch64] autocloud-backend-aarch64.arm.fedoraproject.org -[autocloud-backend-stg:children] -autocloud-backend-libvirt-stg -autocloud-backend-vbox-stg +[autocloud_backend_stg:children] +autocloud_backend_libvirt_stg +autocloud_backend_vbox_stg -[autocloud-backend-libvirt-stg] +[autocloud_backend_libvirt_stg] autocloud-backend01.stg.phx2.fedoraproject.org -[autocloud-backend-vbox-stg] +[autocloud_backend_vbox_stg] autocloud-backend02.stg.phx2.fedoraproject.org [autosign] autosign01.phx2.fedoraproject.org -[autosign-stg] +[autosign_stg] autosign01.stg.phx2.fedoraproject.org [dbserver] @@ -296,7 +296,7 @@ db-qa01.qa.fedoraproject.org db-qa02.qa.fedoraproject.org db-qa03.qa.fedoraproject.org -[dbserver-stg] +[dbserver_stg] db-fas01.stg.phx2.fedoraproject.org db01.stg.phx2.fedoraproject.org db03.stg.phx2.fedoraproject.org @@ -306,15 +306,15 @@ db-koji01.stg.phx2.fedoraproject.org [pgbdr] # postgresql bidirectional replication servers (stg) -[pgbdr-stg] +[pgbdr_stg] pgbdr01.stg.phx2.fedoraproject.org pgbdr02.stg.phx2.fedoraproject.org # clients that talk to the main postgres servers -[postgres-clients] +[postgres_clients] # clients that talk to the main postgres stg servers -[postgres-clients-stg] +[postgres_clients_stg] badges-backend01.stg.phx2.fedoraproject.org badges-web01.stg.phx2.fedoraproject.org blockerbugs01.stg.phx2.fedoraproject.org @@ -333,20 +333,20 @@ os-node02.stg.phx2.fedoraproject.org os-node03.stg.phx2.fedoraproject.org os-node04.stg.phx2.fedoraproject.org -[download-phx2] +[download_phx2] download01.phx2.fedoraproject.org download02.phx2.fedoraproject.org download03.phx2.fedoraproject.org download04.phx2.fedoraproject.org download05.phx2.fedoraproject.org -[download-ibiblio] +[download_ibiblio] download-ib01.fedoraproject.org -[download-rdu2] +[download_rdu2] download-rdu01.fedoraproject.org -[download-cc-rdu] +[download_cc_rdu] download-cc-rdu01.fedoraproject.org [download_tier1] @@ -354,24 +354,24 @@ download04.phx2.fedoraproject.org download05.phx2.fedoraproject.org #download-rdu01.fedoraproject.org -[download-phx2-virtual] +[download_phx2_virtual] download01.phx2.fedoraproject.org download02.phx2.fedoraproject.org download03.phx2.fedoraproject.org [download:children] -download-phx2 -download-phx2-virtual -download-ibiblio -download-rdu2 -download-cc-rdu +download_phx2 +download_phx2_virtual +download_ibiblio +download_rdu2 +download_cc_rdu [elections] elections01.phx2.fedoraproject.org elections02.phx2.fedoraproject.org -[elections-stg] +[elections_stg] elections01.stg.phx2.fedoraproject.org [fas] @@ -379,22 +379,22 @@ fas01.phx2.fedoraproject.org fas02.phx2.fedoraproject.org fas03.phx2.fedoraproject.org -[fas-stg] +[fas_stg] fas01.stg.phx2.fedoraproject.org [hotness] hotness01.phx2.fedoraproject.org -[hotness-stg] +[hotness_stg] hotness01.stg.phx2.fedoraproject.org [kerneltest] kerneltest01.phx2.fedoraproject.org -[kerneltest-stg] +[kerneltest_stg] kerneltest01.stg.phx2.fedoraproject.org -[kernel-qa] +[kernel_qa] kernel01.qa.fedoraproject.org kernel02.qa.fedoraproject.org @@ -405,24 +405,24 @@ keys01.fedoraproject.org koji01.phx2.fedoraproject.org koji02.phx2.fedoraproject.org -[koji-stg] +[koji_stg] koji01.stg.phx2.fedoraproject.org [kojipkgs] kojipkgs01.phx2.fedoraproject.org kojipkgs02.phx2.fedoraproject.org -[koschei-backend] +[koschei_backend] koschei-backend01.phx2.fedoraproject.org -[koschei-backend-stg] +[koschei_backend_stg] koschei-backend01.stg.phx2.fedoraproject.org -[koschei-web] +[koschei_web] koschei-web01.phx2.fedoraproject.org koschei-web02.phx2.fedoraproject.org -[koschei-web-stg] +[koschei_web_stg] koschei-web01.stg.phx2.fedoraproject.org [infracore] @@ -443,27 +443,27 @@ batcave13.rdu2.fedoraproject.org ipa01.phx2.fedoraproject.org ipa02.phx2.fedoraproject.org -[ipa-stg] +[ipa_stg] ipa01.stg.phx2.fedoraproject.org -[ipsilon-dev] +[ipsilon_dev] iddev.fedorainfracloud.org [nagios] noc01.phx2.fedoraproject.org noc02.fedoraproject.org -[notifs-backend] +[notifs_backend] notifs-backend01.phx2.fedoraproject.org -[notifs-backend-stg] +[notifs_backend_stg] notifs-backend01.stg.phx2.fedoraproject.org -[notifs-web] +[notifs_web] notifs-web01.phx2.fedoraproject.org notifs-web02.phx2.fedoraproject.org -[notifs-web-stg] +[notifs_web_stg] notifs-web01.stg.phx2.fedoraproject.org notifs-web02.stg.phx2.fedoraproject.org @@ -471,7 +471,7 @@ notifs-web02.stg.phx2.fedoraproject.org nuancier01.phx2.fedoraproject.org nuancier02.phx2.fedoraproject.org -[nuancier-stg] +[nuancier_stg] nuancier01.stg.phx2.fedoraproject.org nuancier02.stg.phx2.fedoraproject.org @@ -479,10 +479,10 @@ nuancier02.stg.phx2.fedoraproject.org memcached01.phx2.fedoraproject.org memcached02.phx2.fedoraproject.org -[memcached-stg] +[memcached_stg] memcached01.stg.phx2.fedoraproject.org -[mirrorlist-proxies] +[mirrorlist_proxies] proxy01.phx2.fedoraproject.org proxy02.fedoraproject.org proxy03.fedoraproject.org @@ -500,36 +500,36 @@ proxy14.fedoraproject.org proxy101.phx2.fedoraproject.org proxy110.phx2.fedoraproject.org -[mm-frontend] +[mm_frontend] mm-frontend01.phx2.fedoraproject.org mm-frontend02.phx2.fedoraproject.org mm-frontend-checkin01.phx2.fedoraproject.org -[mm-backend] +[mm_backend] mm-backend01.phx2.fedoraproject.org -[mm-crawler] +[mm_crawler] mm-crawler01.phx2.fedoraproject.org mm-crawler02.phx2.fedoraproject.org -[mm-frontend-stg] +[mm_frontend_stg] mm-frontend01.stg.phx2.fedoraproject.org -[mm-backend-stg] +[mm_backend_stg] mm-backend01.stg.phx2.fedoraproject.org -[mm-crawler-stg] +[mm_crawler_stg] mm-crawler01.stg.phx2.fedoraproject.org [mm:children] -mm-frontend -mm-backend -mm-crawler +mm_frontend +mm_backend +mm_crawler -[mm-stg:children] -mm-frontend-stg -mm-backend-stg -mm-crawler-stg +[mm_stg:children] +mm_frontend_stg +mm_backend_stg +mm_crawler_stg [people] people02.fedoraproject.org @@ -559,44 +559,44 @@ ns04.phx2.fedoraproject.org ns05.fedoraproject.org ns13.rdu2.fedoraproject.org -[dns-external] +[dns_external] ns02.fedoraproject.org ns04.phx2.fedoraproject.org ns05.fedoraproject.org -[odcs-frontend] +[odcs_frontend] odcs-frontend01.phx2.fedoraproject.org -[odcs-frontend-stg] +[odcs_frontend_stg] odcs-frontend01.stg.phx2.fedoraproject.org -[odcs-backend] +[odcs_backend] odcs-backend01.phx2.fedoraproject.org -[odcs-backend-stg] +[odcs_backend_stg] odcs-backend01.stg.phx2.fedoraproject.org -[odcs-stg:children] -odcs-frontend-stg -odcs-backend-stg +[odcs_stg:children] +odcs_frontend_stg +odcs_backend_stg [odcs:children] -odcs-frontend -odcs-backend +odcs_frontend +odcs_backend [openqa] openqa01.qa.fedoraproject.org -[openqa-workers] +[openqa_workers] qa02.qa.fedoraproject.org qa05.qa.fedoraproject.org qa14.qa.fedoraproject.org # openqa-stg and openqa-stg-workers are pseudo-stg, see group_vars/openqa-stg for more details -[openqa-stg] +[openqa_stg] openqa-stg01.qa.fedoraproject.org -[openqa-stg-workers] +[openqa_stg_workers] qa01.qa.fedoraproject.org qa07.qa.fedoraproject.org qa09.qa.fedoraproject.org @@ -610,7 +610,7 @@ aarch64-c29n1-oqa.arm.fedoraproject.org aarch64-c30n1-oqa.arm.fedoraproject.org # the workers that can run networked jobs. each server should have *one* of these per arch -[openqa-tap-workers] +[openqa_tap_workers] qa01.qa.fedoraproject.org qa02.qa.fedoraproject.org openqa-ppc64le-01.qa.fedoraproject.org @@ -619,7 +619,7 @@ aarch64-c26n1-oqa.arm.fedoraproject.org # the workers that need rw access to the factory share to run createhdds. again, # only one per arch per instance should be present. usually x86_64 images are created # on the server, images for other arches on a worker. -[openqa-hdds-workers] +[openqa_hdds_workers] openqa-ppc64le-01.qa.fedoraproject.org aarch64-c26n1-oqa.arm.fedoraproject.org # this is a temporary workaround for #1539330 - as building the images @@ -631,22 +631,22 @@ qa09.qa.fedoraproject.org packages03.phx2.fedoraproject.org packages04.phx2.fedoraproject.org -[packages-stg] +[packages_stg] packages03.stg.phx2.fedoraproject.org [pkgs] pkgs02.phx2.fedoraproject.org -[pkgs-stg] +[pkgs_stg] pkgs01.stg.phx2.fedoraproject.org [loopabull] loopabull01.phx2.fedoraproject.org -[loopabull-stg] +[loopabull_stg] loopabull01.stg.phx2.fedoraproject.org -[proxies-external] +[proxies_external] proxy01.phx2.fedoraproject.org proxy02.fedoraproject.org proxy03.fedoraproject.org @@ -662,22 +662,22 @@ proxy12.fedoraproject.org proxy13.fedoraproject.org proxy14.fedoraproject.org -[proxies-internal] +[proxies_internal] proxy101.phx2.fedoraproject.org proxy110.phx2.fedoraproject.org [proxies:children] -proxies-external -proxies-internal +proxies_external +proxies_internal -[proxies-stg] +[proxies_stg] proxy01.stg.phx2.fedoraproject.org # This group should only ever contain *ONE* system [relvalconsumer] openqa01.qa.fedoraproject.org -[relvalconsumer-test] +[relvalconsumer_test] openqa-stg01.qa.fedoraproject.org # This group should only ever contain *ONE* system @@ -687,20 +687,20 @@ openqa-stg01.qa.fedoraproject.org openqa01.qa.fedoraproject.org [resultsdb:children] -resultsdb-dev -resultsdb-stg -resultsdb-prod +resultsdb_dev +resultsdb_stg +resultsdb_prod -[resultsdb-stg] +[resultsdb_stg] resultsdb-stg01.qa.fedoraproject.org -[resultsdb-dev] +[resultsdb_dev] resultsdb-dev01.qa.fedoraproject.org -[resultsdb-prod] +[resultsdb_prod] resultsdb01.qa.fedoraproject.org -[smtp-mm] +[smtp_mm] smtp-mm-ib01.fedoraproject.org smtp-mm-osuosl01.fedoraproject.org smtp-mm-cc-rdu01.fedoraproject.org @@ -830,7 +830,7 @@ simple-koji-ci-dev.fedorainfracloud.org # They are exempted from the iptables wall between staging and prod. # For instance, staging needs to send collectd logs to log01 and smtp mail data # to bastion (both of which are prod boxen). -[staging-friendly] +[staging_friendly] batcave01.phx2.fedoraproject.org bastion01.phx2.fedoraproject.org bastion02.phx2.fedoraproject.org @@ -855,30 +855,30 @@ tang02.phx2.fedoraproject.org sundries01.phx2.fedoraproject.org sundries02.phx2.fedoraproject.org -[sundries-stg] +[sundries_stg] sundries01.stg.phx2.fedoraproject.org [taskotron:children] -taskotron-dev -taskotron-stg -taskotron-prod +taskotron_dev +taskotron_stg +taskotron_prod -[taskotron-dev] +[taskotron_dev] taskotron-dev01.qa.fedoraproject.org -[taskotron-dev-client-hosts] +[taskotron_dev_client_hosts] qa11.qa.fedoraproject.org -[taskotron-stg] +[taskotron_stg] taskotron-stg01.qa.fedoraproject.org -[taskotron-stg-client-hosts] +[taskotron_stg_client_hosts] qa10.qa.fedoraproject.org -[taskotron-prod] +[taskotron_prod] taskotron01.qa.fedoraproject.org -[taskotron-prod-client-hosts] +[taskotron_prod_client_hosts] qa12.qa.fedoraproject.org qa13.qa.fedoraproject.org @@ -890,7 +890,7 @@ unbound-osuosl01.fedoraproject.org [value] value01.phx2.fedoraproject.org -[value-stg] +[value_stg] value01.stg.phx2.fedoraproject.org [virthost] @@ -914,19 +914,19 @@ virthost21.phx2.fedoraproject.org virthost22.phx2.fedoraproject.org qa09.qa.fedoraproject.org -[virthost-comm] +[virthost_comm] virthost-comm01.qa.fedoraproject.org virthost-comm03.qa.fedoraproject.org virthost-comm04.qa.fedoraproject.org -[wiki-stg] +[wiki_stg] wiki01.stg.phx2.fedoraproject.org [wiki] wiki01.phx2.fedoraproject.org wiki02.phx2.fedoraproject.org -[zanata2fedmsg-stg] +[zanata2fedmsg_stg] zanata2fedmsg01.stg.phx2.fedoraproject.org [zanata2fedmsg] @@ -938,48 +938,48 @@ zanata2fedmsg01.phx2.fedoraproject.org # - inventory/group_vars/proxies for the iptables custom_rules list # - roles/fedmsg/base/templates/relay.py.j2 # - filter_plugins/fedmsg.py -[fedmsg-qa-network] +[fedmsg_qa_network] retrace01.qa.fedoraproject.org resultsdb01.qa.fedoraproject.org openqa01.qa.fedoraproject.org openqa-ppc64le-01.qa.fedoraproject.org -[fedmsg-qa-network-stg] +[fedmsg_qa_network_stg] resultsdb-stg01.qa.fedoraproject.org openqa-stg01.qa.fedoraproject.org # assorted categories of fedmsg services, for convenience -[fedmsg-hubs:children] -autocloud-backend -badges-backend +[fedmsg_hubs:children] +autocloud_backend +badges_backend busgateway bugyou fedimg -freshmaker-backend +freshmaker_backend hotness -mbs-backend -notifs-backend -pdc-backend +mbs_backend +notifs_backend +pdc_backend pkgs -[fedmsg-hubs-stg:children] -autocloud-backend-stg -badges-backend-stg -busgateway-stg -bugyou-stg -fedimg-stg -freshmaker-backend-stg -hotness-stg -mbs-backend-stg -notifs-backend-stg -pdc-backend-stg -pkgs-stg +[fedmsg_hubs_stg:children] +autocloud_backend_stg +badges_backend_stg +busgateway_stg +bugyou_stg +fedimg_stg +freshmaker_backend_stg +hotness_stg +mbs_backend_stg +notifs_backend_stg +pdc_backend-stg +pkgs_stg -[fedmsg-ircs:children] +[fedmsg_ircs:children] value -[fedmsg-ircs-stg:children] -value-stg +[fedmsg_ircs_stg:children] +value_stg # This group is for "instances" we have in inventory but do not # want to monitor in nagios because they don't really exist as @@ -990,52 +990,52 @@ value-stg relay.ci.centos.org relay-stg.ci.centos.org -[fedmsg-relays:children] +[fedmsg_relays:children] busgateway -[fedmsg-relays-stg:children] -busgateway-stg +[fedmsg_relays_stg:children] +busgateway_stg -[fedmsg-gateways:children] +[fedmsg_gateways:children] busgateway proxies -[fedmsg-gateways-stg:children] -busgateway-stg -proxies-stg +[fedmsg_gateways_stg:children] +busgateway_stg +proxies_stg -[moksha-hubs:children] +[moksha_hubs:children] bugzilla2fedmsg -[moksha-hubs-stg:children] -bugzilla2fedmsg-stg +[moksha_hubs_stg:children] +bugzilla2fedmsg_stg -[fedmsg-services:children] -fedmsg-hubs -fedmsg-ircs -fedmsg-relays -fedmsg-gateways -moksha-hubs +[fedmsg_services:children] +fedmsg_hubs +fedmsg_ircs +fedmsg_relays +fedmsg_gateways +moksha_hubs -[fedmsg-services-stg:children] -fedmsg-hubs-stg -fedmsg-ircs-stg -fedmsg-relays-stg -fedmsg-gateways-stg -moksha-hubs-stg +[fedmsg_services_stg:children] +fedmsg_hubs_stg +fedmsg_ircs_stg +fedmsg_relays_stg +fedmsg_gateways_stg +moksha_hubs_stg # These are groups that are using the python34 fedmsg stack. -[python34-fedmsg:children] +[python34_fedmsg:children] mailman -mailman-stg +mailman_stg mdapi -mdapi-stg -openqa-stg +mdapi_stg +openqa_stg openqa ## END fedmsg services -[cloud-hardware] +[cloud_hardware] #fed-cloud01.cloud.fedoraproject.org #fed-cloud02.cloud.fedoraproject.org fed-cloud03.cloud.fedoraproject.org @@ -1059,7 +1059,7 @@ virthost-aarch64-os01.fedorainfracloud.org virthost-aarch64-os02.fedorainfracloud.org virthost-cloud01.fedorainfracloud.org -[openstack-compute] +[openstack_compute] fed-cloud03.cloud.fedoraproject.org fed-cloud04.cloud.fedoraproject.org fed-cloud05.cloud.fedoraproject.org @@ -1075,27 +1075,27 @@ fed-cloud15.cloud.fedoraproject.org #fed-cloud-ppc01.cloud.fedoraproject.org fed-cloud-ppc02.cloud.fedoraproject.org -[newcloud-undercloud] +[newcloud_undercloud] undercloud01.cloud.fedoraproject.org -[pdc-web] +[pdc_web] pdc-web01.phx2.fedoraproject.org pdc-web02.phx2.fedoraproject.org -[pdc-web-stg] +[pdc_web_stg] pdc-web01.stg.phx2.fedoraproject.org -[pdc-backend] +[pdc_backend] pdc-backend01.phx2.fedoraproject.org pdc-backend02.phx2.fedoraproject.org pdc-backend03.phx2.fedoraproject.org -[pdc-backend-stg] +[pdc_backend_stg] pdc-backend01.stg.phx2.fedoraproject.org pdc-backend02.stg.phx2.fedoraproject.org pdc-backend03.stg.phx2.fedoraproject.org -[persistent-cloud] +[persistent_cloud] # artboard instance artboard.fedorainfracloud.org # copr production instances @@ -1154,7 +1154,7 @@ libravatar-stg.fedorainfracloud.org # testdays.fedorainfracloud.org -[maintainer-test] +[maintainer_test] f28-test.fedorainfracloud.org f29-test.fedorainfracloud.org f30-test.fedorainfracloud.org @@ -1164,7 +1164,7 @@ ppc64le-test.fedorainfracloud.org el6-test.fedorainfracloud.org el7-test.fedorainfracloud.org -[aarch64-test] +[aarch64_test] aarch64-test01.fedorainfracloud.org aarch64-test02.fedorainfracloud.org @@ -1190,10 +1190,10 @@ dns bastion backup infracore -smtp-mm +smtp_mm memcached virthost -colo-virt +colo_virt [groupc:children] value @@ -1207,83 +1207,83 @@ buildvmhost people02.fedoraproject.org [virtservers:children] -colo-virt +colo_virt virthost bvirthost buildvmhost -virthost-comm +virthost_comm -[copr-keygen] +[copr_keygen] copr-keygen.cloud.fedoraproject.org -[copr-front] +[copr_front] copr-fe.cloud.fedoraproject.org -[copr-back] +[copr_back] copr-be.cloud.fedoraproject.org -[copr-dist-git] +[copr_dist_git] copr-dist-git.fedorainfracloud.org -[copr-front-dev] +[copr_front_dev] copr-fe-dev.cloud.fedoraproject.org -[copr-back-dev] +[copr_back_dev] copr-be-dev.cloud.fedoraproject.org -[copr-keygen-dev] +[copr_keygen_dev] copr-keygen-dev.cloud.fedoraproject.org -[copr-dist-git-dev] +[copr_dist_git_dev] copr-dist-git-dev.fedorainfracloud.org -[copr-front-stg] +[copr_front_stg] copr-frontend01.stg.phx2.fedoraproject.org copr-frontend02.stg.phx2.fedoraproject.org -[copr-back-stg] +[copr_back_stg] copr-be-stg.fedorainfracloud.org -[copr-keygen-stg] +[copr_keygen_stg] copr-keygen-stg.fedorainfracloud.org -[copr-dist-git-stg] +[copr_dist_git_stg] copr-dist-git-stg.fedorainfracloud.org [copr:children] -copr-front -copr-back -copr-keygen -copr-dist-git +copr_front +copr_back +copr_keygen +copr_dist-git -[copr-stg:children] -copr-front-stg -copr-back-stg -copr-keygen-stg -copr-dist-git-stg +[copr_stg:children] +copr_front_stg +copr_back_stg +copr_keygen_stg +copr_dist-git_stg -[copr-dev:children] -copr-front-dev -copr-back-dev -copr-keygen-dev -copr-dist-git-dev +[copr_dev:children] +copr_front_dev +copr_back_dev +copr_keygen_dev +copr_dist-git_dev [libravatar] libravatar.fedorainfracloud.org -[libravatar-stg] +[libravatar_stg] libravatar-stg.fedorainfracloud.org [pagure] pagure01.fedoraproject.org -[pagure-stg] +[pagure_stg] pagure-stg01.fedoraproject.org -[pagure-proxy] +[pagure_proxy] pagure-proxy01.fedoraproject.org -[twisted-buildbots] +[twisted_buildbots] twisted-fedora26-1.fedorainfracloud.org twisted-fedora26-2.fedorainfracloud.org twisted-fedora27-1.fedorainfracloud.org @@ -1294,10 +1294,10 @@ twisted-rhel7-2.fedorainfracloud.org [infinote] infinote.fedoraproject.org -[gnome-backups] +[gnome_backups] gnome-backups01.phx2.fedoraproject.org -[qa-isolated] +[qa_isolated] beaker01.qa.fedoraproject.org beaker-stg01.qa.fedoraproject.org # openQA boxes start - note openQA aarch64 workers intentionally not @@ -1325,80 +1325,80 @@ qa13.qa.fedoraproject.org taskotron-stg01.qa.fedoraproject.org taskotron01.qa.fedoraproject.org -[osbs-control] +[osbs_control] osbs-control01.phx2.fedoraproject.org -[osbs-control-stg] +[osbs_control_stg] osbs-control01.stg.phx2.fedoraproject.org -[osbs-nodes] +[osbs_nodes] osbs-node01.phx2.fedoraproject.org osbs-node02.phx2.fedoraproject.org -[osbs-masters] +[osbs_masters] osbs-master01.phx2.fedoraproject.org -[osbs-aarch64-masters] +[osbs_aarch64_masters] osbs-aarch64-master01.arm.fedoraproject.org -[osbs-aarch64-nodes] +[osbs_aarch64_nodes] osbs-aarch64-master01.arm.fedoraproject.org [osbs:children] -osbs-control -osbs-nodes -osbs-masters -osbs-aarch64-nodes -osbs-aarch64-masters +osbs_control +osbs_nodes +osbs_masters +osbs_aarch64_nodes +osbs_aarch64_masters -[osbs-masters-stg] +[osbs_masters_stg] osbs-master01.stg.phx2.fedoraproject.org -[osbs-aarch64-masters-stg] +[osbs_aarch64_masters_stg] osbs-aarch64-master01.stg.arm.fedoraproject.org -[osbs-aarch64-nodes-stg] +[osbs_aarch64_nodes_stg] osbs-aarch64-master01.stg.arm.fedoraproject.org -[osbs-nodes-stg] +[osbs_nodes_stg] osbs-node01.stg.phx2.fedoraproject.org osbs-node02.stg.phx2.fedoraproject.org -[osbs-stg:children] -osbs-control-stg -osbs-masters-stg -osbs-nodes-stg -osbs-aarch64-masters-stg -osbs-aarch64-nodes-stg +[osbs_stg:children] +osbs_control_stg +osbs_masters_stg +osbs_nodes_stg +osbs_aarch64_masters_stg +osbs_aarch64_nodes_stg -[os-control-stg] +[os_control_stg] os-control01.stg.phx2.fedoraproject.org -[os-masters-stg] +[os_masters_stg] os-master01.stg.phx2.fedoraproject.org os-master02.stg.phx2.fedoraproject.org os-master03.stg.phx2.fedoraproject.org -[os-nodes-stg] +[os_nodes_stg] os-node01.stg.phx2.fedoraproject.org os-node02.stg.phx2.fedoraproject.org os-node03.stg.phx2.fedoraproject.org os-node04.stg.phx2.fedoraproject.org -[os-stg:children] -os-nodes-stg -os-masters-stg -os-control-stg +[os_stg:children] +os_nodes_stg +os_masters_stg +os_control_stg -[os-control] +[os_control] os-control01.phx2.fedoraproject.org -[os-masters] +[os_masters] os-master01.phx2.fedoraproject.org os-master02.phx2.fedoraproject.org os-master03.phx2.fedoraproject.org -[os-nodes] +[os_nodes] os-node01.phx2.fedoraproject.org os-node02.phx2.fedoraproject.org os-node03.phx2.fedoraproject.org @@ -1406,29 +1406,29 @@ os-node04.phx2.fedoraproject.org os-node05.phx2.fedoraproject.org [os:children] -os-nodes -os-masters -os-control +os_nodes +os_masters +os_control [ci] ci-cc-rdu01.fedoraproject.org # registries -[oci-registry] +[oci_registry] oci-registry01.phx2.fedoraproject.org oci-registry02.phx2.fedoraproject.org oci-candidate-registry01.phx2.fedoraproject.org -[oci-registry-stg] +[oci_registry_stg] oci-registry01.stg.phx2.fedoraproject.org oci-candidate-registry01.stg.phx2.fedoraproject.org ## Not the candidate just the top registry -[moby-registry] +[moby_registry] oci-registry01.phx2.fedoraproject.org ## Not the candidate just the top registry -[moby-registry-stg] +[moby_registry_stg] oci-registry01.stg.phx2.fedoraproject.org [webservers:children] @@ -1441,7 +1441,7 @@ fas # and we want to not alert on those, so to the client nrpe.conf uses # this group to denote those. # -[zombie-infested] +[zombie_infested] # anon git via systemd socket seems to get zombies from time to time pkgs02.phx2.fedoraproject.org # the openstack 5.0 vnc console viewer causes bunches of Zombies @@ -1456,31 +1456,31 @@ bodhi-backend01.phx2.fedoraproject.org # These are groups of "hosts" that are not real hosts, but represent # applications in openshift. They exists here so that they can declare vars for # other "global" roles like the fedmsg config. -[openshift-pseudohosts:children] +[openshift_pseudohosts:children] greenwave waiverdb bodhi2 -[openshift-pseudohosts-stg:children] -greenwave-stg -waiverdb-stg +[openshift_pseudohosts_stg:children] +greenwave_stg +waiverdb_stg [bodhi2] bodhi-web-temp-bodhi.app.os.fedoraproject.org -[bodhi2-stg] +[bodhi2_stg] bodhi-web-temp-bodhi.app.os.stg.fedoraproject.org [greenwave] greenwave-web-greenwave.app.os.fedoraproject.org -[greenwave-stg] +[greenwave_stg] greenwave-web-greenwave.app.os.stg.fedoraproject.org [waiverdb] waiverdb-web-waiverdb.app.os.fedoraproject.org -[waiverdb-stg] +[waiverdb_stg] waiverdb-web-waiverdb.app.os.stg.fedoraproject.org [sar] @@ -1504,11 +1504,11 @@ retrace01.qa.fedoraproject.org #[rhel8beta] #el8betatest01.stg.phx2.fedoraproject.org -[nfs-servers] +[nfs_servers] drives45-01.phx2.fedoraproject.org # communishift -- community openshift -[virthost-communishift] +[virthost_communishift] #virthost-cloud01.fedorainfracloud.org virthost-os01.fedorainfracloud.org virthost-os02.fedorainfracloud.org @@ -1520,6 +1520,6 @@ virthost-os03.fedorainfracloud.org virthost-aarch64-os01.fedorainfracloud.org virthost-aarch64-os02.fedorainfracloud.org -[os-proxies] +[os_proxies] os-proxy01.fedorainfracloud.org os-proxy02.fedorainfracloud.org diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index a1ff008685..0803d03d4b 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=arm-qa" - name: Setup arm-qa hosts - hosts: arm-qa + hosts: arm_qa user: root gather_facts: True tags: diff --git a/playbooks/groups/autocloud-backend.yml b/playbooks/groups/autocloud-backend.yml index 1699fb7502..f71b62b3be 100644 --- a/playbooks/groups/autocloud-backend.yml +++ b/playbooks/groups/autocloud-backend.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend-stg" - name: dole out the generic configuration - hosts: autocloud-backend:autocloud-backend-stg + hosts: autocloud_backend:autocloud_backend_stg user: root gather_facts: True @@ -32,7 +32,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: autocloud-backend:autocloud-backend-stg + hosts: autocloud_backend:autocloud_backend_stg user: root gather_facts: True vars_files: diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml index a4a2bf18c8..c3fd77a0de 100644 --- a/playbooks/groups/autocloud-web.yml +++ b/playbooks/groups/autocloud-web.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-web:autocloud-web-stg" - name: make the box be real - hosts: autocloud-web:autocloud-web-stg + hosts: autocloud_web:autocloud_web_stg user: root gather_facts: True @@ -34,7 +34,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the app-specific configuration - hosts: autocloud-web:autocloud-web-stg + hosts: autocloud_web:autocloud_web_stg user: root gather_facts: True diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 35819663dc..1947ee7242 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-backend:badges-backend-stg" - name: dole out the generic configuration - hosts: badges-backend:badges-backend-stg + hosts: badges_backend:badges_backend_stg user: root gather_facts: True @@ -38,7 +38,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: badges-backend:badges-backend-stg + hosts: badges_backend:badges_backend_stg user: root gather_facts: True diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 8aeeb7e6ea..14c8a5462a 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-web:badges-web-stg" - name: make the box be real - hosts: badges-web:badges-web-stg + hosts: badges_web:badges_web_stg user: root gather_facts: True diff --git a/playbooks/groups/basset.yml b/playbooks/groups/basset.yml index 09cc0b1f97..d3fe947980 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -3,7 +3,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=basset:basset-stg" - name: make the box be real - hosts: basset:basset-stg + hosts: basset:basset_stg user: root gather_facts: True diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index f4b5d9eb66..14d57552eb 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -34,7 +34,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure bastion-qa - hosts: bastion-comm01.qa.fedoraproject.org + hosts: bastion_comm01.qa.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/groups/beaker-virthosts.yml b/playbooks/groups/beaker-virthosts.yml index b056c4bfcf..75180be7c3 100644 --- a/playbooks/groups/beaker-virthosts.yml +++ b/playbooks/groups/beaker-virthosts.yml @@ -5,7 +5,7 @@ # virtual machine clients - name: make virthost server system - hosts: beaker-virthosts + hosts: beaker_virthosts user: root gather_facts: True diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 188b57f772..5fe2b40bc5 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -5,7 +5,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker:beaker-stg" - name: make the box be real - hosts: beaker:beaker-stg + hosts: beaker:beaker_stg user: root gather_facts: True @@ -38,7 +38,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure beaker and required services - hosts: beaker:beaker-stg + hosts: beaker:beaker_stg user: root gather_facts: True diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index fa7c6e0515..5560c68804 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=blockerbugs:blockerbugs-stg" - name: make the box be real - hosts: blockerbugs:blockerbugs-stg + hosts: blockerbugs:blockerbugs_stg user: root gather_facts: True diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index bbad273372..0e18b8a012 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -10,7 +10,7 @@ # Once the instance exists, configure it. - name: make bodhi-backend server system - hosts: bodhi-backend:bodhi-backend-stg + hosts: bodhi_backend:bodhi_backend_stg user: root gather_facts: True diff --git a/playbooks/groups/bugyou.yml b/playbooks/groups/bugyou.yml index f39f4f0cab..79409c5400 100644 --- a/playbooks/groups/bugyou.yml +++ b/playbooks/groups/bugyou.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugyou:bugyou-stg" - name: dole out the generic configuration - hosts: bugyou:bugyou-stg + hosts: bugyou:bugyou_stg user: root gather_facts: True @@ -35,7 +35,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics - hosts: bugyou:bugyou-stg + hosts: bugyou:bugyou_stg user: root gather_facts: True @@ -51,7 +51,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: bugyou:bugyou-stg + hosts: bugyou:bugyou_stg user: root gather_facts: True diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index 8b06f2f0b5..86fb31feb2 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugzilla2fedmsg:bugzilla2fedmsg-stg" - name: dole out the generic configuration - hosts: bugzilla2fedmsg:bugzilla2fedmsg-stg + hosts: bugzilla2fedmsg:bugzilla2fedmsg_stg user: root gather_facts: True @@ -36,7 +36,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: bugzilla2fedmsg:bugzilla2fedmsg-stg + hosts: bugzilla2fedmsg:bugzilla2fedmsg_stg user: root gather_facts: True diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index af3fbb5dcb..3e6af805ce 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg" - name: make koji builder(s) - hosts: buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg:buildvm-s390x:buildvm-s390x-stg + hosts: buildvm:buildvm_stg:buildvm_aarch64:buildvm_armv7:buildvm_ppc64:buildvm_ppc64le:buildvm_ppc64_stg:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_armv7_stg:buildvm_s390x:buildvm_s390x_stg user: root gather_facts: True @@ -67,7 +67,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure osbs on koji builders - hosts: buildvm:buildvm-stg + hosts: buildvm:buildvm_stg tags: - osbs user: root @@ -167,7 +167,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure varnish cache - hosts: buildvm-s390x-07.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org + hosts: buildvm_s390x_07.s390.fedoraproject.org:buildvm_s390x_01.stg.s390.fedoraproject.org tags: - varnish user: root @@ -185,7 +185,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure sshfs on buildvm-s390x-01 - hosts: buildvm-s390x-01.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org + hosts: buildvm_s390x_01.s390.fedoraproject.org:buildvm_s390x_01.stg.s390.fedoraproject.org tags: - sshfs user: root diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index 36bd745d71..d833ec7c6c 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=busgateway:busgateway-stg" - name: dole out the generic configuration - hosts: busgateway:busgateway-stg + hosts: busgateway:busgateway_stg user: root gather_facts: True @@ -33,7 +33,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: busgateway:busgateway-stg + hosts: busgateway:busgateway_stg user: root gather_facts: True diff --git a/playbooks/groups/copr-backend.yml b/playbooks/groups/copr-backend.yml index b8b8793c82..02cc32a3d2 100644 --- a/playbooks/groups/copr-backend.yml +++ b/playbooks/groups/copr-backend.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: copr-back-dev:copr-back-stg:copr-back + hosts: copr_back_dev:copr_back_stg:copr_back user: root gather_facts: False @@ -12,7 +12,7 @@ - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup - hosts: copr-back-dev:copr-back-stg:copr-back + hosts: copr_back_dev:copr_back_stg:copr_back user: root gather_facts: True vars_files: @@ -30,7 +30,7 @@ hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" - name: provision instance - hosts: copr-back-dev:copr-back-stg:copr-back + hosts: copr_back_dev:copr_back_stg:copr_back user: root gather_facts: True diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml index 437c142939..be4233b88a 100644 --- a/playbooks/groups/copr-dist-git.yml +++ b/playbooks/groups/copr-dist-git.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: copr-dist-git-dev:copr-dist-git-stg:copr-dist-git + hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git user: root gather_facts: False @@ -13,7 +13,7 @@ - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup - hosts: copr-dist-git-dev:copr-dist-git-stg:copr-dist-git + hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git user: root gather_facts: True vars_files: @@ -29,7 +29,7 @@ hostname: name="{{copr_hostbase}}.fedorainfracloud.org" - name: provision instance - hosts: copr-dist-git-dev:copr-dist-git-stg:copr-dist-git + hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git user: root gather_facts: True diff --git a/playbooks/groups/copr-frontend-cloud.yml b/playbooks/groups/copr-frontend-cloud.yml index dd3935918a..8cdf8d16c3 100644 --- a/playbooks/groups/copr-frontend-cloud.yml +++ b/playbooks/groups/copr-frontend-cloud.yml @@ -1,6 +1,6 @@ - name: check/create instance - hosts: copr-front-dev:copr-front - # hosts: copr-front + hosts: copr_front_dev:copr_front + # hosts: copr_front gather_facts: False vars_files: @@ -13,8 +13,8 @@ - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup - hosts: copr-front-dev:copr-front - # hosts: copr-front + hosts: copr_front_dev:copr_front + # hosts: copr_front gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -29,8 +29,8 @@ hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" - name: provision instance - hosts: copr-front:copr-front-dev - # hosts: copr-front + hosts: copr_front:copr_front_dev + # hosts: copr_front gather_facts: True vars_files: diff --git a/playbooks/groups/copr-frontend.yml b/playbooks/groups/copr-frontend.yml index 7a2028d382..b8571739e7 100644 --- a/playbooks/groups/copr-frontend.yml +++ b/playbooks/groups/copr-frontend.yml @@ -2,7 +2,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=copr-front-stg" - name: provision copr frontend - hosts: copr-front-stg + hosts: copr_front_stg user: root gather_facts: True diff --git a/playbooks/groups/copr-keygen.yml b/playbooks/groups/copr-keygen.yml index 46a786d3f1..445b126f89 100644 --- a/playbooks/groups/copr-keygen.yml +++ b/playbooks/groups/copr-keygen.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: copr-keygen-dev:copr-keygen-stg:copr-keygen + hosts: copr_keygen_dev:copr_keygen_stg:copr_keygen gather_facts: False vars_files: @@ -20,7 +20,7 @@ when: facts is failed - name: cloud basic setup - hosts: copr-keygen-dev:copr-keygen-stg:copr-keygen + hosts: copr_keygen_dev:copr_keygen_stg:copr_keygen gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -35,7 +35,7 @@ hostname: name="{{copr_hostbase}}.cloud.fedoraproject.org" - name: provision instance - hosts: copr-keygen-dev:copr-keygen-stg:copr-keygen + hosts: copr_keygen_dev:copr_keygen_stg:copr_keygen gather_facts: True vars_files: diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 1dc42cba36..c7f2aa310a 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -3,7 +3,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=datagrepper:datagrepper-stg" - name: make the box be real - hosts: datagrepper:datagrepper-stg + hosts: datagrepper:datagrepper_stg user: root gather_facts: True @@ -37,7 +37,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: datagrepper:datagrepper-stg + hosts: datagrepper:datagrepper_stg user: root gather_facts: True @@ -60,7 +60,7 @@ # datagrepper that is partially in place, but not yet functional. # #- name: set up gluster server on prod -# hosts: datagrepper:datagrepper-stg +# hosts: datagrepper:datagrepper_stg # user: root # gather_facts: True # @@ -82,7 +82,7 @@ # - import_tasks: "{{ handlers_path }}/restart_services.yml" # #- name: set up gluster client on prod -# hosts: datagrepper:datagrepper-stg +# hosts: datagrepper:datagrepper_stg # user: root # gather_facts: True # diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index e1c51ca71b..6e7b2d1247 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=elections:elections-stg" - name: make the box be real - hosts: elections:elections-stg + hosts: elections:elections_stg user: root gather_facts: True @@ -34,7 +34,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg on elections - hosts: elections:elections-stg + hosts: elections:elections_stg user: root gather_facts: True @@ -50,7 +50,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy elections itself - hosts: elections:elections-stg + hosts: elections:elections_stg user: root gather_facts: True diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index fdeb984f11..aaf0dd4d25 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -3,7 +3,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas:fas-stg" - name: make the box be real - hosts: fas-stg:fas + hosts: fas_stg:fas user: root gather_facts: True diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 3bc8015532..870e0a7991 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -4,7 +4,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedimg:fedimg-stg" - name: dole out the generic configuration - hosts: fedimg:fedimg-stg + hosts: fedimg:fedimg_stg user: root gather_facts: True @@ -38,7 +38,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: fedimg:fedimg-stg + hosts: fedimg:fedimg_stg user: root gather_facts: True diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 5416122866..41458f6db7 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedocal-stg:fedocal" - name: make the box be real - hosts: fedocal-stg:fedocal + hosts: fedocal_stg:fedocal user: root gather_facts: True @@ -34,7 +34,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg - hosts: fedocal-stg:fedocal + hosts: fedocal_stg:fedocal user: root gather_facts: True @@ -50,7 +50,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy fedocal itself - hosts: fedocal-stg:fedocal + hosts: fedocal_stg:fedocal user: root gather_facts: True diff --git a/playbooks/groups/freshmaker.yml b/playbooks/groups/freshmaker.yml index 8eeb09cdff..8ac8b26740 100644 --- a/playbooks/groups/freshmaker.yml +++ b/playbooks/groups/freshmaker.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=freshmaker:freshmaker-stg" - name: make the box be real - hosts: freshmaker:freshmaker-stg + hosts: freshmaker:freshmaker_stg user: root gather_facts: True @@ -31,7 +31,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes - hosts: freshmaker-frontend + hosts: freshmaker_frontend user: root gather_facts: True @@ -47,7 +47,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up Freshmaker frontend - hosts: freshmaker-frontend:freshmaker-frontend-stg + hosts: freshmaker_frontend:freshmaker_frontend_stg user: root gather_facts: True @@ -67,7 +67,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up Freshmaker backend - hosts: freshmaker-backend:freshmaker-backend-stg + hosts: freshmaker_backend:freshmaker_backend_stg user: root gather_facts: True diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 2ccc2b0853..4a2185567a 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=github2fedmsg:github2fedmsg-stg" - name: make the box be real - hosts: github2fedmsg:github2fedmsg-stg + hosts: github2fedmsg:github2fedmsg_stg user: root gather_facts: True @@ -39,7 +39,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config - hosts: github2fedmsg:github2fedmsg-stg + hosts: github2fedmsg:github2fedmsg_stg user: root gather_facts: True diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 0c583c7c0d..af3f45f821 100644 --- a/playbooks/groups/gnome-backups.yml +++ b/playbooks/groups/gnome-backups.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=gnome-backups" - name: make the boxen be real for real - hosts: gnome-backups + hosts: gnome_backups user: root gather_facts: True diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index 33578f9254..bee45f9f5f 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=hotness:hotness-stg" - name: dole out the generic configuration - hosts: hotness:hotness-stg + hosts: hotness:hotness_stg user: root gather_facts: True @@ -42,7 +42,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg basics - hosts: hotness:hotness-stg + hosts: hotness:hotness_stg user: root gather_facts: True @@ -58,7 +58,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: hotness:hotness-stg + hosts: hotness:hotness_stg user: root gather_facts: True diff --git a/playbooks/groups/hubs.yml b/playbooks/groups/hubs.yml index 5bf96741a5..aed6b7ffa0 100644 --- a/playbooks/groups/hubs.yml +++ b/playbooks/groups/hubs.yml @@ -3,7 +3,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=hubs-stg" - name: make the box be real - hosts: hubs-stg + hosts: hubs_stg user: root gather_facts: True @@ -76,7 +76,7 @@ # - name: setup Hubs - hosts: hubs-stg + hosts: hubs_stg user: root gather_facts: True diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index 1a50ffdf14..f385b28f2f 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipa:ipa-stg" - name: make the box be real - hosts: ipa:ipa-stg + hosts: ipa:ipa_stg user: root gather_facts: True @@ -33,7 +33,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy ipa itself - hosts: ipa:ipa-stg + hosts: ipa:ipa_stg user: root gather_facts: True @@ -89,7 +89,7 @@ # - config - name: do base role once more to revert any resolvconf changes - hosts: ipa:ipa-stg + hosts: ipa:ipa_stg user: root gather_facts: True diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index c5bb0b7a0b..3d86759332 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kerneltest:kerneltest-stg" - name: make the box be real - hosts: kerneltest-stg:kerneltest + hosts: kerneltest_stg:kerneltest user: root gather_facts: True @@ -39,7 +39,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config - hosts: kerneltest-stg:kerneltest + hosts: kerneltest_stg:kerneltest user: root gather_facts: True diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 7facf94c83..773fcf95ce 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -7,7 +7,7 @@ # Once the instance exists, configure it. - name: make koji_hub server system - hosts: koji-stg:koji + hosts: koji_stg:koji user: root gather_facts: True diff --git a/playbooks/groups/koschei-backend.yml b/playbooks/groups/koschei-backend.yml index 68d7666ec7..994e1122f8 100644 --- a/playbooks/groups/koschei-backend.yml +++ b/playbooks/groups/koschei-backend.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-backend:koschei-backend-stg" - name: install koschei - hosts: koschei-backend + hosts: koschei_backend user: root gather_facts: True diff --git a/playbooks/groups/koschei-web.yml b/playbooks/groups/koschei-web.yml index 65e1be4580..35bfc351d4 100644 --- a/playbooks/groups/koschei-web.yml +++ b/playbooks/groups/koschei-web.yml @@ -2,7 +2,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-web:koschei-web-stg" - name: install koschei-frontend - hosts: koschei-web + hosts: koschei_web user: root gather_facts: True diff --git a/playbooks/groups/libravatar.yml b/playbooks/groups/libravatar.yml index 4dad63955c..32d2a91db4 100644 --- a/playbooks/groups/libravatar.yml +++ b/playbooks/groups/libravatar.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: libravatar-stg:libravatar + hosts: libravatar_stg:libravatar gather_facts: False vars_files: @@ -12,7 +12,7 @@ - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: cloud basic setup - hosts: libravatar-stg:libravatar + hosts: libravatar_stg:libravatar gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -26,7 +26,7 @@ - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml" - name: provision instance - hosts: libravatar-stg:libravatar + hosts: libravatar_stg:libravatar gather_facts: True vars_files: diff --git a/playbooks/groups/loopabull.yml b/playbooks/groups/loopabull.yml index 7708d5c5f8..ec986bc1b7 100644 --- a/playbooks/groups/loopabull.yml +++ b/playbooks/groups/loopabull.yml @@ -2,7 +2,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=loopabull:loopabull-stg" - name: make the box be real - hosts: loopabull:loopabull-stg + hosts: loopabull:loopabull_stg user: root gather_facts: True @@ -31,7 +31,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy and configure loopabull - hosts: loopabull:loopabull-stg + hosts: loopabull:loopabull_stg user: root gather_facts: True @@ -78,7 +78,7 @@ - name: Post Loopabull install configuration - hosts: loopabull:loopabull-stg + hosts: loopabull:loopabull_stg user: root gather_facts: True diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 42abda9512..3c2142b8fb 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -5,7 +5,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mailman:mailman-stg" - name: make the box be real - hosts: mailman-stg:mailman + hosts: mailman_stg:mailman user: root gather_facts: True @@ -83,7 +83,7 @@ # Real MM/HK-specific work - name: setup mailman and hyperkitty - hosts: mailman-stg:mailman + hosts: mailman_stg:mailman user: root gather_facts: True diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml index 9575df0640..bfa4e48418 100644 --- a/playbooks/groups/maintainer-test.yml +++ b/playbooks/groups/maintainer-test.yml @@ -1,5 +1,5 @@ - name: Spin up maintainertest cloud instances - hosts: maintainer-test + hosts: maintainer_test gather_facts: False vars_files: @@ -12,7 +12,7 @@ - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: Do some basic cloud setup on them - hosts: maintainer-test + hosts: maintainer_test gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -36,7 +36,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=aarch64-test" - name: Setup maintainer test hosts - hosts: arm-packager:maintainer-test:aarch64-test + hosts: arm_packager:maintainer_test:aarch64_test gather_facts: True tags: - maintainer-test diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml index e2cc3c41a5..9560c794b6 100644 --- a/playbooks/groups/mbs.yml +++ b/playbooks/groups/mbs.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mbs:mbs-stg" - name: make the box be real - hosts: mbs:mbs-stg + hosts: mbs:mbs_stg user: root gather_facts: True @@ -31,7 +31,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes - hosts: mbs-frontend + hosts: mbs_frontend user: root gather_facts: True @@ -47,7 +47,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Set up apache on the frontend MBS API app - hosts: mbs-frontend:mbs-frontend-stg + hosts: mbs_frontend:mbs_frontend_stg user: root gather_facts: True @@ -63,7 +63,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg configuration and common mbs files - hosts: mbs:mbs-stg + hosts: mbs:mbs_stg user: root gather_facts: True @@ -80,7 +80,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy the frontend MBS API app - hosts: mbs-frontend:mbs-frontend-stg + hosts: mbs_frontend:mbs_frontend_stg user: root gather_facts: True @@ -108,7 +108,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy the backend MBS scheduler daemon - hosts: mbs-backend:mbs-backend-stg + hosts: mbs_backend:mbs_backend_stg user: root gather_facts: True diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml index c6de2fa0a0..ca7b048dfc 100644 --- a/playbooks/groups/mdapi.yml +++ b/playbooks/groups/mdapi.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mdapi:mdapi-stg" - name: make the box be real - hosts: mdapi-stg:mdapi + hosts: mdapi_stg:mdapi user: root gather_facts: True @@ -33,7 +33,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy mdapi itself - hosts: mdapi-stg:mdapi + hosts: mdapi_stg:mdapi user: root gather_facts: True @@ -50,7 +50,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg - hosts: mdapi-stg:mdapi + hosts: mdapi_stg:mdapi user: root gather_facts: True diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 94b764bb22..17e83f0f85 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=memcached:memcached-stg" - name: make the box be real - hosts: memcached:memcached-stg + hosts: memcached:memcached_stg user: root gather_facts: True diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 3405653f8d..e6eec8e923 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mm:mm-stg" - name: make the boxe be real for real - hosts: mm:mm-stg + hosts: mm:mm_stg user: root gather_facts: True @@ -32,7 +32,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the backend - hosts: mm-backend:mm-backend-stg + hosts: mm_backend:mm_backend_stg user: root gather_facts: True @@ -50,7 +50,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the crawler - hosts: mm-crawler:mm-crawler-stg + hosts: mm_crawler:mm_crawler_stg user: root gather_facts: True @@ -69,7 +69,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Deploy the frontend (web-app) - hosts: mm-frontend:mm-frontend-stg + hosts: mm_frontend:mm_frontend_stg user: root gather_facts: True @@ -87,7 +87,7 @@ # Do this one last, since the mirrormanager user needs to exist so that it can # own the fedmsg certs we put in place here. - name: Put fedmsg stuff in place - hosts: mm:mm-stg + hosts: mm:mm_stg user: root gather_facts: True diff --git a/playbooks/groups/modernpaste.yml b/playbooks/groups/modernpaste.yml index cbf2a0ff59..30f8a41d27 100644 --- a/playbooks/groups/modernpaste.yml +++ b/playbooks/groups/modernpaste.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=modernpaste-stg:modernpaste" - name: dole out the generic configuration - hosts: modernpaste-stg:modernpaste + hosts: modernpaste_stg:modernpaste user: root gather_facts: True @@ -37,7 +37,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: modernpaste-stg:modernpaste + hosts: modernpaste_stg:modernpaste user: root gather_facts: True diff --git a/playbooks/groups/newcloud-undercloud.yml b/playbooks/groups/newcloud-undercloud.yml index 6d2244ed31..07577926e4 100644 --- a/playbooks/groups/newcloud-undercloud.yml +++ b/playbooks/groups/newcloud-undercloud.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=newcloud-undercloud" - name: make the box be real - hosts: newcloud-undercloud + hosts: newcloud_undercloud user: root gather_facts: True diff --git a/playbooks/groups/nfs-servers.yml b/playbooks/groups/nfs-servers.yml index 6cf4d263b3..114413e124 100644 --- a/playbooks/groups/nfs-servers.yml +++ b/playbooks/groups/nfs-servers.yml @@ -1,7 +1,7 @@ # This is a basic playbook - name: dole out the basic configuration - hosts: nfs-servers + hosts: nfs_servers user: root gather_facts: True @@ -30,7 +30,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the NFS configuration - hosts: nfs-servers + hosts: nfs_servers user: root gather_facts: True diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index c7794bfb08..ec3a49121c 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-backend:notifs-backend-stg" - name: dole out the generic configuration - hosts: notifs-backend:notifs-backend-stg + hosts: notifs_backend:notifs_backend_stg user: root gather_facts: True @@ -40,7 +40,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: notifs-backend:notifs-backend-stg + hosts: notifs_backend:notifs_backend_stg user: root gather_facts: True diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 5df6efa354..71eadb218e 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-web:notifs-web-stg" - name: make the box be real - hosts: notifs-web:notifs-web-stg + hosts: notifs_web:notifs_web_stg user: root gather_facts: True diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index a311c8a40f..d8bf9ab6e8 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nuancier:nuancier-stg" - name: make the box be real - hosts: nuancier:nuancier-stg + hosts: nuancier:nuancier_stg user: root gather_facts: True @@ -38,7 +38,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up fedmsg - hosts: nuancier:nuancier-stg + hosts: nuancier:nuancier_stg user: root gather_facts: True @@ -54,7 +54,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up gluster on stg - hosts: nuancier-stg + hosts: nuancier_stg user: root gather_facts: True @@ -114,7 +114,7 @@ mountdir: /var/cache/nuancier - name: deploy nuancier itself - hosts: nuancier:nuancier-stg + hosts: nuancier:nuancier_stg user: root gather_facts: True diff --git a/playbooks/groups/oci-registry.yml b/playbooks/groups/oci-registry.yml index ee94221b93..a3368a99e5 100644 --- a/playbooks/groups/oci-registry.yml +++ b/playbooks/groups/oci-registry.yml @@ -2,7 +2,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=oci-registry:oci-registry-stg" - name: make the box be real - hosts: oci-registry:oci-registry-stg + hosts: oci_registry:oci_registry_stg user: root gather_facts: True @@ -46,7 +46,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup docker distribution registry - hosts: oci-registry:oci-registry-stg + hosts: oci_registry:oci_registry_stg vars_files: - /srv/web/infra/ansible/vars/global.yml - /srv/private/ansible/vars.yml diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index ea821fa672..af9c451835 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=odcs:odcs-stg" - name: make the box be real - hosts: odcs:odcs-stg + hosts: odcs:odcs_stg user: root gather_facts: True @@ -31,7 +31,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: openvpn on the prod frontend nodes - hosts: odcs-frontend + hosts: odcs_frontend user: root gather_facts: True @@ -47,7 +47,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Set up a gluster share on the backend for the frontend - hosts: odcs:odcs-stg + hosts: odcs:odcs_stg user: root gather_facts: True @@ -73,7 +73,7 @@ when: env != 'staging' - name: Set up odcs frontend service - hosts: odcs-frontend:odcs-frontend-stg + hosts: odcs_frontend:odcs_frontend_stg user: root gather_facts: True @@ -99,7 +99,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Set up odcs backend service - hosts: odcs-backend:odcs-backend-stg + hosts: odcs_backend:odcs_backend_stg user: root gather_facts: True @@ -122,7 +122,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Set up /mnt/koji on both the frontend and backend - hosts: odcs:odcs-stg + hosts: odcs:odcs_stg user: root gather_facts: True diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index 9601ebde57..b1ac685d02 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -1,5 +1,5 @@ - name: configure openQA workers - hosts: openqa-workers:openqa-hdds-workers:openqa-stg-workers + hosts: openqa_workers:openqa_hdds_workers:openqa_stg_workers user: root gather_facts: True diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 153b93995b..e5c315d81c 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa-stg" - name: setup base openqa host - hosts: openqa:openqa-stg + hosts: openqa:openqa_stg user: root gather_facts: True @@ -33,7 +33,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure openQA - hosts: openqa:openqa-stg + hosts: openqa:openqa_stg user: root gather_facts: True @@ -59,7 +59,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: set up openQA server data NFS mounts (staging) - hosts: openqa-stg + hosts: openqa_stg vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml index cba7633942..730c19dce6 100644 --- a/playbooks/groups/openstack-compute-nodes.yml +++ b/playbooks/groups/openstack-compute-nodes.yml @@ -1,7 +1,7 @@ --- - name: deploy Open Stack compute nodes - hosts: openstack-compute + hosts: openstack_compute gather_facts: True vars_files: diff --git a/playbooks/groups/os-cluster.yml b/playbooks/groups/os-cluster.yml index 2c00fa2679..c61f964d8f 100644 --- a/playbooks/groups/os-cluster.yml +++ b/playbooks/groups/os-cluster.yml @@ -2,7 +2,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os-control-stg:os-control:os-nodes-stg:os-masters-stg:os-nodes:os-masters" - name: make the box be real - hosts: os-control:os-control-stg:os-masters-stg:os-nodes-stg:os-masters:os-nodes + hosts: os_control:os_control_stg:os_masters_stg:os_nodes_stg:os_masters:os_nodes user: root gather_facts: True @@ -21,7 +21,7 @@ - rsyncd - sudo - { role: openvpn/client, - when: env != "staging" and 'os-control' not in group_names } + when: env != "staging" and 'os_control' not in group_names } tasks: - name: put openshift repo on os- systems @@ -54,7 +54,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: OSBS control hosts pre-req setup - hosts: os-control:os-control-stg + hosts: os_control:os_control_stg tags: - os-cluster-prereq user: root @@ -97,7 +97,7 @@ package: name=python-passlib state=present - name: Pre tasks for master/nodes - hosts: os-masters-stg:os-masters + hosts: os_masters_stg:os_masters tags: - os-cluster-deploy user: root @@ -117,7 +117,7 @@ file: state=link src=/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem dest=/etc/origin/master/fedoraidp_openid_ca.crt - name: Deploy OpenShift cluster - hosts: os-control:os-control-stg + hosts: os_control:os_control_stg tags: - os-cluster-deploy user: root @@ -189,7 +189,7 @@ } - name: Post-Install setup - hosts: os-stg:os + hosts: os_stg:os tags: - os-post-install vars_files: @@ -204,7 +204,7 @@ - iptables - name: Post-Install master setup - hosts: os-masters-stg:os-masters + hosts: os_masters_stg:os_masters tags: - os-post-install vars_files: diff --git a/playbooks/groups/os-proxies.yml b/playbooks/groups/os-proxies.yml index ca32ce08b0..93307e822f 100644 --- a/playbooks/groups/os-proxies.yml +++ b/playbooks/groups/os-proxies.yml @@ -3,7 +3,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os-proxies" - name: make the box be real - hosts: os-proxies + hosts: os_proxies user: root gather_facts: True diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 9b89287daf..78937afd90 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -7,7 +7,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-aarch64-masters" - name: make the box be real - hosts: osbs-control:osbs-masters:osbs-nodes:osbs-control-stg:osbs-masters-stg:osbs-nodes-stg:osbs-aarch64-masters-stg:osbs-aarch64-masters + hosts: osbs_control:osbs_masters:osbs_nodes:osbs_control_stg:osbs_masters_stg:osbs_nodes_stg:osbs_aarch64_masters_stg:osbs_aarch64_masters user: root gather_facts: True @@ -37,7 +37,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: OSBS control hosts pre-req setup - hosts: osbs-control:osbs-control-stg + hosts: osbs_control:osbs_control_stg tags: - osbs-cluster-prereq user: root @@ -64,7 +64,7 @@ value: "True" - name: Setup cluster masters pre-reqs - hosts: osbs-masters-stg:osbs-masters:osbs-aarch64-masters-stg:osbs-aarch64-masters + hosts: osbs_masters_stg:osbs_masters:osbs_aarch64_masters_stg:osbs_aarch64_masters tags: - osbs-cluster-prereq user: root @@ -103,7 +103,7 @@ - name: Setup cluster hosts pre-reqs - hosts: osbs-masters-stg:osbs-nodes-stg:osbs-masters:osbs-nodes:osbs-aarch64-masters-stg:osbs-aarch64-masters + hosts: osbs_masters_stg:osbs_nodes_stg:osbs_masters:osbs_nodes:osbs_aarch64_masters_stg:osbs_aarch64_masters tags: - osbs-cluster-prereq user: root @@ -164,7 +164,7 @@ dest: "/etc/sysconfig/docker-storage-setup" - name: Deploy kerberose keytab to cluster hosts - hosts: osbs-masters-stg:osbs-nodes-stg:osbs-masters:osbs-nodes:osbs-aarch64-masters-stg:osbs-aarch64-masters + hosts: osbs_masters_stg:osbs_nodes_stg:osbs_masters:osbs_nodes:osbs_aarch64_masters_stg:osbs_aarch64_masters tags: - osbs-cluster-prereq user: root @@ -190,7 +190,7 @@ when: env == "staging" - name: Deploy OpenShift Cluster x86_64 - hosts: osbs-control:osbs-control-stg + hosts: osbs_control:osbs_control_stg tags: - osbs-deploy-openshift - osbs-x86-deploy-openshift @@ -230,7 +230,7 @@ tags: ['openshift-cluster-x86','ansible-ansible-openshift-ansible'] - name: Deploy OpenShift Cluster aarch64 - hosts: osbs-control:osbs-control-stg + hosts: osbs_control:osbs_control_stg tags: - osbs-deploy-openshift - osbs-aarch-deploy-openshift @@ -270,7 +270,7 @@ tags: ['openshift-cluster-aarch','ansible-ansible-openshift-ansible'] - name: Setup OSBS requirements for OpenShift cluster hosts - hosts: osbs-masters-stg:osbs-nodes-stg:osbs-masters:osbs-nodes + hosts: osbs_masters_stg:osbs_nodes_stg:osbs_masters:osbs_nodes tags: - osbs-cluster-req user: root @@ -290,7 +290,7 @@ dest: "/etc/dnsmasq.d/fedora-dns.conf" - name: Create worker namespace - hosts: osbs-masters-stg[0]:osbs-masters[0]:osbs-aarch64-masters-stg[0]:osbs-aarch64-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0]:osbs_aarch64_masters_stg[0]:osbs_aarch64_masters[0] tags: - osbs-worker-namespace user: root @@ -312,7 +312,7 @@ osbs_sources_command: "{{ osbs_conf_sources_command }}" - name: setup ODCS secret in worker namespace - hosts: osbs-masters-stg[0]:osbs-masters[0]:osbs-aarch64-masters-stg[0]:osbs-aarch64-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0]:osbs_aarch64_masters_stg[0]:osbs_aarch64_masters[0] vars_files: - /srv/web/infra/ansible/vars/global.yml - "/srv/private/ansible/vars.yml" @@ -328,7 +328,7 @@ - osbs-worker-namespace - name: Create orchestrator namespace - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] roles: - role: osbs-namespace osbs_orchestrator: true @@ -346,7 +346,7 @@ - name: Add the orchestrator labels to the nodes - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] tags: - osbs-labels-nodes tasks: @@ -361,7 +361,7 @@ when: env == "production" - name: Add the worker labels to the nodes x86_64 - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] tags: - osbs-labels-nodes tasks: @@ -375,7 +375,7 @@ when: env == "production" - name: Add the worker labels to the nodes aarch64 - hosts: osbs-aarch64-masters-stg[0]:osbs-aarch64-masters[0] + hosts: osbs_aarch64_masters_stg[0]:osbs_aarch64_masters[0] tags: - osbs-labels-nodes tasks: @@ -389,7 +389,7 @@ when: env == "production" - name: setup reactor config secret in orchestrator namespace - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] roles: - role: osbs-secret osbs_secret_name: reactor-config-secret @@ -400,7 +400,7 @@ - osbs-orchestrator-namespace - name: setup ODCS secret in orchestrator namespace - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] vars_files: - /srv/web/infra/ansible/vars/global.yml - "/srv/private/ansible/vars.yml" @@ -416,7 +416,7 @@ - name: setup client config secret in orchestrator namespace - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] roles: - role: osbs-secret osbs_secret_name: client-config-secret @@ -427,7 +427,7 @@ - osbs-orchestrator-namespace - name: Save orchestrator token x86_64 - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] tasks: - name: get orchestrator service account token command: "oc -n {{ osbs_worker_namespace }} sa get-token orchestrator" @@ -442,7 +442,7 @@ - osbs-orchestrator-namespace - name: setup orchestrator token for x86_64-osbs - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] vars_files: - /srv/web/infra/ansible/vars/global.yml - "/srv/private/ansible/vars.yml" @@ -464,7 +464,7 @@ - osbs-orchestrator-namespace - name: Save orchestrator token aarch64 - hosts: osbs-aarch64-masters-stg[0]:osbs-aarch64-masters[0] + hosts: osbs_aarch64_masters_stg[0]:osbs_aarch64_masters[0] tasks: - name: get orchestrator service account token command: "oc -n {{ osbs_worker_namespace }} sa get-token orchestrator" @@ -479,7 +479,7 @@ - osbs-orchestrator-namespace - name: setup orchestrator token for aarch64-osbs - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] vars_files: - /srv/web/infra/ansible/vars/global.yml - "/srv/private/ansible/vars.yml" @@ -502,7 +502,7 @@ - osbs-orchestrator-namespace - name: Add dockercfg secret to allow registry push orchestrator - hosts: osbs-masters-stg[0]:osbs-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0] tags: - osbs-dockercfg-secret user: root @@ -541,7 +541,7 @@ path="/tmp/.dockercfg" - name: Add dockercfg secret to allow registry push worker - hosts: osbs-masters-stg[0]:osbs-masters[0]:osbs-aarch64-masters-stg[0]:osbs-aarch64-masters[0] + hosts: osbs_masters_stg[0]:osbs_masters[0]:osbs_aarch64_masters_stg[0]:osbs_aarch64_masters[0] tags: - osbs-dockercfg-secret user: root @@ -581,7 +581,7 @@ path="/tmp/.dockercfg" - name: post-install master host osbs tasks - hosts: osbs-masters-stg:osbs-masters:osbs-aarch64-masters-stg[0]:osbs-aarch64-masters[0] + hosts: osbs_masters_stg:osbs_masters:osbs_aarch64_masters_stg[0]:osbs_aarch64_masters[0] tags: - osbs-post-install vars_files: @@ -606,7 +606,7 @@ dest: "/etc/cron.d/cleanup-old-osbs-builds" - name: post-install osbs control tasks - hosts: osbs-control + hosts: osbs_control tags: osbs-post-install vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -621,7 +621,7 @@ - name: post-install osbs tasks - hosts: osbs-nodes-stg:osbs-nodes:osbs-aarch64-nodes-stg:osbs-aarch64-nodes + hosts: osbs_nodes_stg:osbs_nodes:osbs_aarch64_nodes_stg:osbs_aarch64_nodes tags: - osbs-post-install vars_files: diff --git a/playbooks/groups/overcloud-config.yml b/playbooks/groups/overcloud-config.yml index 4734e55f2b..43bc9cf0b1 100644 --- a/playbooks/groups/overcloud-config.yml +++ b/playbooks/groups/overcloud-config.yml @@ -1,5 +1,5 @@ - name: configure overcloud from undercloud - hosts: newcloud-undercloud + hosts: newcloud_undercloud user: root gather_facts: True diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 8b53065e1d..76951c7697 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=packages:packages-stg" - name: make the box be real - hosts: packages:packages-stg + hosts: packages:packages_stg user: root gather_facts: True @@ -39,7 +39,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the new service specific config - hosts: packages:packages-stg + hosts: packages:packages_stg user: root gather_facts: True diff --git a/playbooks/groups/pagure-proxy.yml b/playbooks/groups/pagure-proxy.yml index ef49f84858..d50ab421e4 100644 --- a/playbooks/groups/pagure-proxy.yml +++ b/playbooks/groups/pagure-proxy.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pagure-proxy" - name: make the boxen be real for real - hosts: pagure-proxy + hosts: pagure_proxy user: root gather_facts: True diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index 5c32e02a9f..e76581ad0e 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pagure:pagure-stg" - name: make the boxen be real for real - hosts: pagure:pagure-stg + hosts: pagure:pagure_stg user: root gather_facts: True @@ -32,7 +32,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy pagure itself - hosts: pagure:pagure-stg + hosts: pagure:pagure_stg user: root gather_facts: True diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index bc44c50acd..91fe555ad2 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -3,7 +3,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pdc-web:pdc-web-stg:pdc-backend:pdc-backend-stg" - name: dole out the generic configuration - hosts: pdc-web:pdc-web-stg:pdc-backend:pdc-backend-stg + hosts: pdc_web:pdc_web_stg:pdc_backend:pdc_backend_stg user: root gather_facts: True vars_files: @@ -30,7 +30,7 @@ - import_tasks: "{{ tasks_path }}/motd.yml" - name: stuff for the web nodes - hosts: pdc-web:pdc-web-stg + hosts: pdc_web:pdc_web_stg user: root gather_facts: True vars_files: @@ -48,7 +48,7 @@ - pdc/frontend - name: stuff just for the backend nodes - hosts: pdc-backend:pdc-backend-stg + hosts: pdc_backend:pdc_backend_stg user: root gather_facts: True vars_files: diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index ee820b93b7..f4e9ce35e3 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgs-stg:pkgs02.phx2.fedoraproject.org" - name: make the box be real - hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org + hosts: pkgs_stg:pkgs02.phx2.fedoraproject.org user: root gather_facts: True @@ -70,7 +70,7 @@ - name: setup fedmsg on pkgs - hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org + hosts: pkgs_stg:pkgs02.phx2.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index a9f2abbeaa..e57c015c7f 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -7,7 +7,7 @@ # Once the instance exists, configure it. - name: configure postgresql server system - hosts: db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-qa02.qa.fedoraproject.org:db-koji01.stg.phx2.fedoraproject.org:db-qa03.qa.fedoraproject.org + hosts: db_datanommer02.phx2.fedoraproject.org:db_qa01.qa.fedoraproject.org:db_koji01.phx2.fedoraproject.org:db_fas01.stg.phx2.fedoraproject.org:db_fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db_qa02.qa.fedoraproject.org:db_koji01.stg.phx2.fedoraproject.org:db_qa03.qa.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 0144c9e211..a177834dcb 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -3,7 +3,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg:!proxy05.fedoraproject.org" - name: make the box be real - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies user: root gather_facts: True @@ -25,7 +25,7 @@ - sudo - rsyncd - { role: mirrormanager/mirrorlist_proxy, - when: env == "staging" or "'mirrorlist-proxy' in group_names" } + when: env == "staging" or "'mirrorlist_proxy' in group_names" } - { role: openvpn/client, when: env != "staging" } - apache @@ -63,7 +63,7 @@ - name: Set up the proxy basics - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies strategy: free user: root gather_facts: False @@ -104,7 +104,7 @@ - import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-miscellaneous.yml - name: Make sure we are deployed fully - hosts: proxies-stg:proxies + hosts: proxies_stg:proxies strategy: free user: root gather_facts: False diff --git a/playbooks/groups/qa.yml b/playbooks/groups/qa.yml index eb24c5747f..4d7f965e5d 100644 --- a/playbooks/groups/qa.yml +++ b/playbooks/groups/qa.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=qa-prod:qa-stg" - name: make the box be real - hosts: qa-prod:qa-stg + hosts: qa_prod:qa_stg user: root gather_facts: True @@ -39,7 +39,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure qa buildbot CI - hosts: qa-stg + hosts: qa_stg user: root gather_facts: True @@ -58,7 +58,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure static sites for qa-stg - hosts: qa-prod:qa-stg + hosts: qa_prod:qa_stg user: root gather_facts: True diff --git a/playbooks/groups/rabbitmq.yml b/playbooks/groups/rabbitmq.yml index 169e78c5f3..21aa88c7cc 100644 --- a/playbooks/groups/rabbitmq.yml +++ b/playbooks/groups/rabbitmq.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=rabbitmq:rabbitmq-stg" - name: make the box be real - hosts: rabbitmq:rabbitmq-stg + hosts: rabbitmq:rabbitmq_stg user: root gather_facts: True diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 624f1841c4..4b6a8ee5c5 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng-compose:releng-stg" - name: Setup releng compose hosts - hosts: releng-compose:releng-stg + hosts: releng_compose:releng_stg user: root gather_facts: True tags: @@ -46,9 +46,9 @@ - role: loopabull/target loopabull_role: ociimage when: inventory_hostname == 'composer.stg.phx2.fedoraproject.org' - - { role: nfs/client, when: "'releng-stg' not in group_names", mnt_dir: '/mnt/fedora_koji', nfs_src_dir: "{{ koji_hub_nfs }}" } - - { role: nfs/client, when: "'releng-compose' in group_names", mnt_dir: '/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - - { role: nfs/client, when: "'releng-stg' in group_names", mnt_dir: '/mnt/fedora_koji_prod', nfs_src_dir: "{{ koji_hub_nfs }}" } + _ { role: nfs/client, when: "'releng_stg' not in group_names", mnt_dir: '/mnt/fedora_koji', nfs_src_dir: "{{ koji_hub_nfs }}" } + _ { role: nfs/client, when: "'releng_compose' in group_names", mnt_dir: '/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } + _ { role: nfs/client, when: "'releng_stg' in group_names", mnt_dir: '/mnt/fedora_koji_prod', nfs_src_dir: "{{ koji_hub_nfs }}" } - fedmsg/base - role: releng tags: diff --git a/playbooks/groups/resultsdb.yml b/playbooks/groups/resultsdb.yml index 9d1111b4f0..755f0305ea 100644 --- a/playbooks/groups/resultsdb.yml +++ b/playbooks/groups/resultsdb.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-dev:resultsdb-stg:resultsdb-prod" - name: make the box be real - hosts: resultsdb-dev:resultsdb-stg:resultsdb-prod + hosts: resultsdb_dev:resultsdb_stg:resultsdb_prod user: root gather_facts: True @@ -45,7 +45,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure resultsdb production - hosts: resultsdb-dev:resultsdb-stg:resultsdb-prod + hosts: resultsdb_dev:resultsdb_stg:resultsdb_prod user: root gather_facts: True @@ -65,7 +65,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: Install rdbsync - hosts: resultsdb-stg:resultsdb-prod + hosts: resultsdb_stg:resultsdb_prod user: root gather_facts: True diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 3eff73b3e9..e6287df1b8 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -1,6 +1,6 @@ # fedora-messaging setup - name: setup RabbitMQ - hosts: rabbitmq[0]:rabbitmq-stg[0] + hosts: rabbitmq[0]:rabbitmq_stg[0] user: root gather_facts: False tags: rabbitmq diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index dedfc852cc..e8b9908bff 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -9,7 +9,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sign-bridge" - name: configure sign bridge server - hosts: sign-bridge + hosts: sign_bridge user: root gather_facts: true diff --git a/playbooks/groups/simple-koji-ci.yml b/playbooks/groups/simple-koji-ci.yml index 0fb8b5ecd9..c5857f17ac 100644 --- a/playbooks/groups/simple-koji-ci.yml +++ b/playbooks/groups/simple-koji-ci.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: simple-koji-ci-dev.fedorainfracloud.org:simple-koji-ci-prod.fedorainfracloud.org + hosts: simple_koji_ci_dev.fedorainfracloud.org:simple_koji_ci_prod.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: simple-koji-ci-dev.fedorainfracloud.org:simple-koji-ci-prod.fedorainfracloud.org + hosts: simple_koji_ci_dev.fedorainfracloud.org:simple_koji_ci_prod.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index e69cd42049..9b0cf04980 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -3,7 +3,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=smtp-mm" - name: make the box be real - hosts: smtp-mm + hosts: smtp_mm user: root gather_facts: True diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index c695ee33bf..d166424f7b 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sundries:sundries-stg" - name: make the box be real - hosts: sundries:sundries-stg + hosts: sundries:sundries_stg user: root gather_facts: True diff --git a/playbooks/groups/taskotron-client-hosts.yml b/playbooks/groups/taskotron-client-hosts.yml index bb01aa5421..1275276da5 100644 --- a/playbooks/groups/taskotron-client-hosts.yml +++ b/playbooks/groups/taskotron-client-hosts.yml @@ -5,7 +5,7 @@ # virtual machine clients - name: basic configuration - hosts: taskotron-dev-client-hosts:taskotron-stg-client-hosts:taskotron-prod-client-hosts + hosts: taskotron_dev_client_hosts:taskotron_stg_client_hosts:taskotron_prod_client_hosts user: root gather_facts: True @@ -52,7 +52,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron client host - hosts: taskotron-dev-client-hosts:taskotron-stg-client-hosts:taskotron-prod-client-hosts + hosts: taskotron_dev_client_hosts:taskotron_stg_client_hosts:taskotron_prod_client_hosts user: root gather_facts: True diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index d2ec99fd6d..2990e76077 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-dev:taskotron-stg:taskotron-prod" - name: make the box be real - hosts: taskotron-dev:taskotron-stg:taskotron-prod + hosts: taskotron_dev:taskotron_stg:taskotron_prod user: root gather_facts: True @@ -41,7 +41,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure taskotron master - hosts: taskotron-dev:taskotron-stg:taskotron-prod + hosts: taskotron_dev:taskotron_stg:taskotron_prod user: root gather_facts: True @@ -66,7 +66,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: configure standalone taskotron host - hosts: taskotron-dev + hosts: taskotron_dev user: root gather_facts: True diff --git a/playbooks/groups/twisted-buildbots.yml b/playbooks/groups/twisted-buildbots.yml index 2a5c853029..f24f660d17 100644 --- a/playbooks/groups/twisted-buildbots.yml +++ b/playbooks/groups/twisted-buildbots.yml @@ -1,5 +1,5 @@ - name: check/create instances - hosts: twisted-buildbots + hosts: twisted_buildbots gather_facts: False vars_files: @@ -12,7 +12,7 @@ - import_tasks: "{{ tasks_path }}/persistent_cloud.yml" - name: setup all the things - hosts: twisted-buildbots + hosts: twisted_buildbots gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 236c00e638..46bdd75248 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -1,7 +1,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=value:value-stg" - name: make the box be real - hosts: value:value-stg + hosts: value:value_stg user: root gather_facts: True diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 1d1c498f2d..e23a0a17f9 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -5,7 +5,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:virthost-communishift" - name: make virthost server system - hosts: virthost:bvirthost:buildvmhost:virthost-comm:colo-virt:virthost-communishift + hosts: virthost:bvirthost:buildvmhost:virthost_comm:colo_virt:virthost_communishift user: root gather_facts: True diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 8bc9d0742a..32c45b7f54 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=wiki:wiki-stg" - name: make the box be real - hosts: wiki:wiki-stg + hosts: wiki:wiki_stg user: root gather_facts: True diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml index 39f5f26339..d6dfe40de4 100644 --- a/playbooks/groups/zanata2fedmsg.yml +++ b/playbooks/groups/zanata2fedmsg.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=zanata2fedmsg:zanata2fedmsg-stg" - name: make the box be real - hosts: zanata2fedmsg:zanata2fedmsg-stg + hosts: zanata2fedmsg:zanata2fedmsg_stg user: root gather_facts: True @@ -39,7 +39,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: deploy service-specific config - hosts: zanata2fedmsg:zanata2fedmsg-stg + hosts: zanata2fedmsg:zanata2fedmsg_stg user: root gather_facts: True diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index ccf566bb41..8493426273 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -1,7 +1,7 @@ # This is a basic playbook - name: make cloud noc hardware - hosts: cloud-noc01.cloud.fedoraproject.org + hosts: cloud_noc01.cloud.fedoraproject.org user: root gather_facts: True diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 62e8e32781..15ca1d6102 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -1,7 +1,7 @@ # This is a basic playbook - name: dole out the generic configuration - hosts: data-analysis01.phx2.fedoraproject.org + hosts: data_analysis01.phx2.fedoraproject.org user: root gather_facts: True @@ -38,7 +38,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: dole out the service-specific config - hosts: data-analysis01.phx2.fedoraproject.org + hosts: data_analysis01.phx2.fedoraproject.org user: root gather_facts: True vars_files: diff --git a/playbooks/hosts/elastic-dev.fedorainfracloud.org.yml b/playbooks/hosts/elastic-dev.fedorainfracloud.org.yml index ae072859b5..07f64f42ca 100644 --- a/playbooks/hosts/elastic-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/elastic-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: elastic-dev.fedorainfracloud.org + hosts: elastic_dev.fedorainfracloud.org gather_facts: False vars_files: @@ -17,7 +17,7 @@ - name: setup all the things - hosts: elastic-dev.fedorainfracloud.org + hosts: elastic_dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml index a55e0e20ba..e6e2ae494b 100644 --- a/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: fas2-dev.fedorainfracloud.org + hosts: fas2_dev.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: fas2-dev.fedorainfracloud.org + hosts: fas2_dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 24ff15d3b2..ee18eb1fca 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -1,6 +1,6 @@ --- - name: Prepare storage on compute nodes - hosts: openstack-compute + hosts: openstack_compute gather_facts: True vars_files: @@ -18,7 +18,7 @@ authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" - name: deploy Open Stack controler - hosts: fed-cloud09.cloud.fedoraproject.org + hosts: fed_cloud09.cloud.fedoraproject.org gather_facts: True vars: diff --git a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml index 9a8cb91960..469119bbc9 100644 --- a/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: fedimg-dev.fedorainfracloud.org + hosts: fedimg_dev.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: fedimg-dev.fedorainfracloud.org + hosts: fedimg_dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml index 840e7c6ef5..837909b6cd 100644 --- a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: fedora-bootstrap.fedorainfracloud.org + hosts: fedora_bootstrap.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: fedora-bootstrap.fedorainfracloud.org + hosts: fedora_bootstrap.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml index dc7e492553..bed2c16afa 100644 --- a/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/glittergallery-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: glittergallery-dev.fedorainfracloud.org + hosts: glittergallery_dev.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: glittergallery-dev.fedorainfracloud.org + hosts: glittergallery_dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/happinesspackets-stg.fedorainfracloud.org.yml b/playbooks/hosts/happinesspackets-stg.fedorainfracloud.org.yml index 85f2e93b8d..f146c40f14 100644 --- a/playbooks/hosts/happinesspackets-stg.fedorainfracloud.org.yml +++ b/playbooks/hosts/happinesspackets-stg.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: happinesspackets-stg.fedorainfracloud.org + hosts: happinesspackets_stg.fedorainfracloud.org gather_facts: False vars_files: @@ -16,7 +16,7 @@ - name: setup all the things - hosts: happinesspackets-stg.fedorainfracloud.org + hosts: happinesspackets_stg.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml index 0c0fe030d9..e2c2d0631d 100644 --- a/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/hubs-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: hubs-dev.fedorainfracloud.org + hosts: hubs_dev.fedorainfracloud.org gather_facts: False vars_files: @@ -16,7 +16,7 @@ - name: setup all the things - hosts: hubs-dev.fedorainfracloud.org + hosts: hubs_dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml index 8074ca9262..cbeb8bf957 100644 --- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: lists-dev.fedorainfracloud.org + hosts: lists_dev.fedorainfracloud.org gather_facts: False vars_files: @@ -15,7 +15,7 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" - name: setup all the things - hosts: lists-dev.fedorainfracloud.org + hosts: lists_dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -97,7 +97,7 @@ # - name: setup db users/passwords for mailman and hyperkitty - hosts: lists-dev.fedorainfracloud.org + hosts: lists_dev.fedorainfracloud.org gather_facts: no become: yes become_user: postgres @@ -125,7 +125,7 @@ - name: setup mailman and hyperkitty - hosts: lists-dev.fedorainfracloud.org + hosts: lists_dev.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/hosts/telegram-irc.fedorainfracloud.org.yml b/playbooks/hosts/telegram-irc.fedorainfracloud.org.yml index b11f11906b..af3e729112 100644 --- a/playbooks/hosts/telegram-irc.fedorainfracloud.org.yml +++ b/playbooks/hosts/telegram-irc.fedorainfracloud.org.yml @@ -1,5 +1,5 @@ - name: check/create instance - hosts: telegram-irc.fedorainfracloud.org + hosts: telegram_irc.fedorainfracloud.org gather_facts: False vars_files: @@ -16,7 +16,7 @@ - name: setup all the things - hosts: telegram-irc.fedorainfracloud.org + hosts: telegram_irc.fedorainfracloud.org gather_facts: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/roles/base/templates/iptables/iptables b/roles/base/templates/iptables/iptables index 6876658ad0..3a6b1982b3 100644 --- a/roles/base/templates/iptables/iptables +++ b/roles/base/templates/iptables/iptables @@ -33,7 +33,7 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging-friendly'] %} +{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} # # In the phx2 datacenter, both production and staging hosts are in the same # vlan, but different subnets. We want production hosts to reject connectons from staging group hosts @@ -44,7 +44,7 @@ -A INPUT -s 10.5.128.0/24 -j REJECT --reject-with icmp-host-prohibited {% endif %} -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa-isolated'] %} +{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} # # In the qa.fedoraproject.org network, we want machines not in the qa-isolated group # to block all access from that group. This is to protect them from any possible attack @@ -70,7 +70,7 @@ -A INPUT -s 10.5.131.47 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.48 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.49 -j REJECT --reject-with icmp-host-prohibited -{% for host in groups['qa-isolated']|sort %} +{% for host in groups['qa_isolated']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited {% else %}# {{ host }} has no 'eth0_ip' listed diff --git a/roles/base/templates/iptables/iptables.download-phx2 b/roles/base/templates/iptables/iptables.download-phx2 index 638ea692b4..a24d2c0ce0 100644 --- a/roles/base/templates/iptables/iptables.download-phx2 +++ b/roles/base/templates/iptables/iptables.download-phx2 @@ -26,7 +26,7 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging-friendly'] %} +{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} # # In the phx2 datacenter, both production and staging hosts are in the same # subnet/vlan. We want production hosts to reject connectons from staging group hosts @@ -42,7 +42,7 @@ {% endfor %} {% endif %} -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa-isolated'] %} +{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} # # In the qa.fedoraproject.org network, we want machines not in the qa-isolated group # to block all access from that group. This is to protect them from any possible attack @@ -68,7 +68,7 @@ -A INPUT -s 10.5.131.47 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.48 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.49 -j REJECT --reject-with icmp-host-prohibited -{% for host in groups['qa-isolated']|sort %} +{% for host in groups['qa_isolated']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited {% else %}# {{ host }} has no 'eth0_ip' listed diff --git a/roles/base/templates/iptables/iptables.kojibuilder b/roles/base/templates/iptables/iptables.kojibuilder index c641183d59..2b75fe8a7b 100644 --- a/roles/base/templates/iptables/iptables.kojibuilder +++ b/roles/base/templates/iptables/iptables.kojibuilder @@ -31,7 +31,7 @@ -A OUTPUT -p tcp -m tcp -d 10.5.125.36 --dport 80 -j ACCEPT -A OUTPUT -p tcp -m tcp -d 10.5.125.35 --dport 80 -j ACCEPT -A OUTPUT -p tcp -m tcp -d 10.5.125.36 --dport 443 -j ACCEPT -{% if host in groups['buildvm-s390x'] %} +{% if host in groups['buildvm_s390x'] %} -A OUTPUT -p tcp -m tcp -d 10.16.0.17 --dport 80 -j ACCEPT {% endif %} diff --git a/roles/base/templates/iptables/iptables.ns03.phx2.fedoraproject.org b/roles/base/templates/iptables/iptables.ns03.phx2.fedoraproject.org index c8e4f05216..ba124f73df 100644 --- a/roles/base/templates/iptables/iptables.ns03.phx2.fedoraproject.org +++ b/roles/base/templates/iptables/iptables.ns03.phx2.fedoraproject.org @@ -33,7 +33,7 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging-friendly'] %} +{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} # # In the phx2 datacenter, both production and staging hosts are in the same # subnet/vlan. We want production hosts to reject connectons from staging group hosts @@ -49,7 +49,7 @@ {% endfor %} {% endif %} -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa-isolated'] %} +{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} # # In the qa.fedoraproject.org network, we want machines not in the qa-isolated group # to block all access from that group. This is to protect them from any possible attack @@ -75,7 +75,7 @@ -A INPUT -s 10.5.131.47 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.48 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.49 -j REJECT --reject-with icmp-host-prohibited -{% for host in groups['qa-isolated']|sort %} +{% for host in groups['qa_isolated']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited {% else %}# {{ host }} has no 'eth0_ip' listed diff --git a/roles/base/templates/iptables/iptables.ns04.phx2.fedoraproject.org b/roles/base/templates/iptables/iptables.ns04.phx2.fedoraproject.org index c8e4f05216..ba124f73df 100644 --- a/roles/base/templates/iptables/iptables.ns04.phx2.fedoraproject.org +++ b/roles/base/templates/iptables/iptables.ns04.phx2.fedoraproject.org @@ -33,7 +33,7 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging-friendly'] %} +{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} # # In the phx2 datacenter, both production and staging hosts are in the same # subnet/vlan. We want production hosts to reject connectons from staging group hosts @@ -49,7 +49,7 @@ {% endfor %} {% endif %} -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa-isolated'] %} +{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} # # In the qa.fedoraproject.org network, we want machines not in the qa-isolated group # to block all access from that group. This is to protect them from any possible attack @@ -75,7 +75,7 @@ -A INPUT -s 10.5.131.47 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.48 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.49 -j REJECT --reject-with icmp-host-prohibited -{% for host in groups['qa-isolated']|sort %} +{% for host in groups['qa_isolated']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited {% else %}# {{ host }} has no 'eth0_ip' listed diff --git a/roles/base/templates/iptables/iptables.openqa-tap-workers b/roles/base/templates/iptables/iptables.openqa-tap-workers index 7a0b631677..dbf5b21958 100644 --- a/roles/base/templates/iptables/iptables.openqa-tap-workers +++ b/roles/base/templates/iptables/iptables.openqa-tap-workers @@ -33,7 +33,7 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging-friendly'] %} +{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} # # In the phx2 datacenter, both production and staging hosts are in the same # subnet/vlan. We want production hosts to reject connectons from staging group hosts @@ -51,7 +51,7 @@ {% endfor %} {% endif %} -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa-isolated'] %} +{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} # # In the qa.fedoraproject.org network, we want machines not in the qa-isolated group # to block all access from that group. This is to protect them from any possible attack @@ -77,7 +77,7 @@ -A INPUT -s 10.5.131.47 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.48 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.49 -j REJECT --reject-with icmp-host-prohibited -{% for host in groups['qa-isolated']|sort %} +{% for host in groups['qa_isolated']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited {% elif 'em3_ip' in hostvars[host] %}# {{ host }} diff --git a/roles/base/templates/iptables/iptables.pgbdr01.stg.phx2.fedoraproject.org b/roles/base/templates/iptables/iptables.pgbdr01.stg.phx2.fedoraproject.org index 5d7c814b8b..eeaecfee23 100644 --- a/roles/base/templates/iptables/iptables.pgbdr01.stg.phx2.fedoraproject.org +++ b/roles/base/templates/iptables/iptables.pgbdr01.stg.phx2.fedoraproject.org @@ -69,13 +69,13 @@ COMMIT {% endfor %} # This is a replicating postgresql server, allow db connections from clients -{% for host in groups['postgres-clients']|sort %} +{% for host in groups['postgres_clients']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -p tcp -m tcp --dport 5432 -j ACCEPT {% else %}# {{ host }} has no 'eth0_ip' listed {% endif %} {% endfor %} -{% for host in groups['postgres-clients-stg']|sort %} +{% for host in groups['postgres_clients_stg']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -p tcp -m tcp --dport 5432 -j ACCEPT {% else %}# {{ host }} has no 'eth0_ip' listed diff --git a/roles/base/templates/iptables/iptables.pgbdr02.stg.phx2.fedoraproject.org b/roles/base/templates/iptables/iptables.pgbdr02.stg.phx2.fedoraproject.org index 5d7c814b8b..eeaecfee23 100644 --- a/roles/base/templates/iptables/iptables.pgbdr02.stg.phx2.fedoraproject.org +++ b/roles/base/templates/iptables/iptables.pgbdr02.stg.phx2.fedoraproject.org @@ -69,13 +69,13 @@ COMMIT {% endfor %} # This is a replicating postgresql server, allow db connections from clients -{% for host in groups['postgres-clients']|sort %} +{% for host in groups['postgres_clients']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -p tcp -m tcp --dport 5432 -j ACCEPT {% else %}# {{ host }} has no 'eth0_ip' listed {% endif %} {% endfor %} -{% for host in groups['postgres-clients-stg']|sort %} +{% for host in groups['postgres_clients_stg']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -p tcp -m tcp --dport 5432 -j ACCEPT {% else %}# {{ host }} has no 'eth0_ip' listed diff --git a/roles/base/templates/iptables/iptables.staging b/roles/base/templates/iptables/iptables.staging index d709b7c230..73918ccd6f 100644 --- a/roles/base/templates/iptables/iptables.staging +++ b/roles/base/templates/iptables/iptables.staging @@ -68,7 +68,7 @@ COMMIT # if there are any proxy-only tcp_ports - allow them {% if proxy_tcp_ports is defined %} {% for port in proxy_tcp_ports %} -{% for proxy in groups['proxies-stg'] %} +{% for proxy in groups['proxies_stg'] %} {% if hostvars[proxy]['vpn'] %} -A INPUT -p tcp -m tcp --dport {{ port }} --src {{ hostvars[proxy]['ansible_tun0']['ipv4']['address'] }} -j ACCEPT {% else %} diff --git a/roles/base/templates/iptables/iptables.torrent02.fedoraproject.org b/roles/base/templates/iptables/iptables.torrent02.fedoraproject.org index e870b58509..bc519998d9 100644 --- a/roles/base/templates/iptables/iptables.torrent02.fedoraproject.org +++ b/roles/base/templates/iptables/iptables.torrent02.fedoraproject.org @@ -33,7 +33,7 @@ -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.41 -j ACCEPT -A INPUT -p tcp -m tcp --dport 5666 -s 10.5.126.241 -j ACCEPT -{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging-friendly'] %} +{% if env != 'staging' and datacenter == 'phx2' and inventory_hostname not in groups['staging_friendly'] %} # # In the phx2 datacenter, both production and staging hosts are in the same # subnet/vlan. We want production hosts to reject connectons from staging group hosts @@ -49,7 +49,7 @@ {% endfor %} {% endif %} -{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa-isolated'] %} +{% if ansible_domain == 'qa.fedoraproject.org' and inventory_hostname not in groups['qa_isolated'] %} # # In the qa.fedoraproject.org network, we want machines not in the qa-isolated group # to block all access from that group. This is to protect them from any possible attack @@ -75,7 +75,7 @@ -A INPUT -s 10.5.131.47 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.48 -j REJECT --reject-with icmp-host-prohibited -A INPUT -s 10.5.131.49 -j REJECT --reject-with icmp-host-prohibited -{% for host in groups['qa-isolated']|sort %} +{% for host in groups['qa_isolated']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} -A INPUT -s {{ hostvars[host]['eth0_ip'] }} -j REJECT --reject-with icmp-host-prohibited {% else %}# {{ host }} has no 'eth0_ip' listed diff --git a/roles/base/templates/syncHttpLogs.sh.j2 b/roles/base/templates/syncHttpLogs.sh.j2 index 8cca68d5da..24318266f8 100644 --- a/roles/base/templates/syncHttpLogs.sh.j2 +++ b/roles/base/templates/syncHttpLogs.sh.j2 @@ -34,12 +34,12 @@ syncHttpLogs {{host}} {% endfor %} ## Sync up all internal proxies -{% for host in groups['proxies-internal'] %} +{% for host in groups['proxies_internal'] %} syncHttpLogs {{host}} {% endfor %} ## Sync up all staging proxies -{% for host in groups['proxies-stg'] %} +{% for host in groups['proxies_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -48,7 +48,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['fas-stg'] %} +{% for host in groups['fas_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -57,7 +57,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['fedocal-stg'] %} +{% for host in groups['fedocal_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -66,7 +66,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['datagrepper-stg'] %} +{% for host in groups['datagrepper_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -75,7 +75,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['ipsilon-stg'] %} +{% for host in groups['ipsilon_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -84,16 +84,16 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['ask-stg'] %} +{% for host in groups['ask_stg'] %} syncHttpLogs {{host}} {% endfor %} ## Sync up all badges hosts -{% for host in groups['badges-web'] %} +{% for host in groups['badges_web'] %} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['badges-web-stg'] %} +{% for host in groups['badges_web_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -102,7 +102,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['elections-stg'] %} +{% for host in groups['elections_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -111,7 +111,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['bodhi2-stg'] %} +{% for host in groups['bodhi2_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -120,7 +120,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['packages-stg'] %} +{% for host in groups['packages_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -129,7 +129,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['blockerbugs-stg'] %} +{% for host in groups['blockerbugs_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -138,7 +138,7 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['value-stg'] %} +{% for host in groups['value_stg'] %} syncHttpLogs {{host}} {% endfor %} @@ -163,15 +163,15 @@ syncHttpLogs {{host}} {% endfor %} ## sync up download -{% for host in groups['download-phx2'] %} +{% for host in groups['download_phx2'] %} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['download-ibiblio'] %} +{% for host in groups['download_ibiblio'] %} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['download-rdu2'] %} +{% for host in groups['download_rdu2'] %} syncHttpLogs {{host}} {% endfor %} @@ -180,43 +180,43 @@ syncHttpLogs {{host}} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['sundries-stg'] %} +{% for host in groups['sundries_stg'] %} syncHttpLogs {{host}} {% endfor %} ## sync up autocloud -{% for host in groups['autocloud-web'] %} +{% for host in groups['autocloud_web'] %} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['autocloud-web-stg'] %} +{% for host in groups['autocloud_web_stg'] %} syncHttpLogs {{host}} {% endfor %} ## sync up koschei -{% for host in groups['koschei-web'] %} +{% for host in groups['koschei_web'] %} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['koschei-web-stg'] %} +{% for host in groups['koschei_web_stg'] %} syncHttpLogs {{host}} {% endfor %} ## sync up notifs -{% for host in groups['notifs-web'] %} +{% for host in groups['notifs_web'] %} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['notifs-web-stg'] %} +{% for host in groups['notifs_web_stg'] %} syncHttpLogs {{host}} {% endfor %} ## Sync up pdc -{% for host in groups['pdc-web'] %} +{% for host in groups['pdc_web'] %} syncHttpLogs {{host}} {% endfor %} -{% for host in groups['pdc-web-stg'] %} +{% for host in groups['pdc_web_stg'] %} syncHttpLogs {{host}} {% endfor %} diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index fb461f0581..843cee066b 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -15,22 +15,22 @@ - name: install python2 fedmsg package package: name=fedmsg state=present - when: "'python34-fedmsg' not in group_names and ansible_distribution_major_version|int < 22" + when: "'python34_fedmsg' not in group_names and ansible_distribution_major_version|int < 22" tags: fedmsg/base - name: install python2 fedmsg package dnf: pkg=fedmsg state=present - when: "'python34-fedmsg' not in group_names and ansible_distribution_major_version|int > 21" + when: "'python34_fedmsg' not in group_names and ansible_distribution_major_version|int > 21" tags: fedmsg/base - name: install the python34 fedmsg package (yum) package: name=python34-fedmsg-core state=present - when: "'python34-fedmsg' in group_names and ansible_distribution_major_version|int < 22" + when: "'python34_fedmsg' in group_names and ansible_distribution_major_version|int < 22" tags: fedmsg/base - name: install the python3 fedmsg package (dnf) dnf: pkg=python3-fedmsg state=present - when: "'python34-fedmsg' in group_names and ansible_distribution_major_version|int > 21" + when: "'python34_fedmsg' in group_names and ansible_distribution_major_version|int > 21" tags: fedmsg/base - name: install needed packages @@ -121,7 +121,7 @@ - relay.py - logging.py - base.py - when: "'persistent-cloud' not in group_names and 'qa-isolated' not in group_names" + when: "'persistent_cloud' not in group_names and 'qa_isolated' not in group_names" tags: - config - fedmsgdconfig @@ -142,7 +142,7 @@ mode=0644 with_items: - policy.py - when: "'persistent-cloud' not in group_names" + when: "'persistent_cloud' not in group_names" tags: - config - fedmsgdconfig @@ -167,7 +167,7 @@ - relay.py - logging.py - base.py - when: "'persistent-cloud' in group_names or 'qa-isolated' in group_names" + when: "'persistent_cloud' in group_names or 'qa_isolated' in group_names" tags: - config - fedmsgdconfig @@ -188,7 +188,7 @@ mode=0644 with_items: - endpoints-external-composer.py - when: "'releng-stg' in group_names" + when: "'releng_stg' in group_names" tags: - config - fedmsgdconfig diff --git a/roles/fedmsg/base/templates/relay.py.j2 b/roles/fedmsg/base/templates/relay.py.j2 index f82baf4726..04cda50bb9 100644 --- a/roles/fedmsg/base/templates/relay.py.j2 +++ b/roles/fedmsg/base/templates/relay.py.j2 @@ -24,7 +24,7 @@ config = dict( # It is also used by the mediawiki php plugin which, due to the oddities of # php, can't maintain a single passive-bind endpoint of it's own. relay_inbound=[ - {% if 'persistent-cloud' in group_names %} + {% if 'persistent_cloud' in group_names %} # Stuff from the cloud has to go through our external proxy first.. #"tcp://hub.fedoraproject.org:9941", @@ -33,13 +33,13 @@ config = dict( # not getting messages in from proxies across the vpn. So, only use # proxy01 for now. "tcp://209.132.181.16:9941", - {% elif 'fedmsg-qa-network' in group_names %} + {% elif 'fedmsg_qa_network' in group_names %} # We want the retrace (and other) boxes to talk to the *internal* IP of # proxy01, because otherwise the RHIT firewall blocks them. "tcp://proxy01.phx2.fedoraproject.org:9941", - {% elif 'fedmsg-qa-network-stg' in group_names %} + {% elif 'fedmsg_qa_network_stg' in group_names %} "tcp://proxy01.stg.phx2.fedoraproject.org:9941", diff --git a/roles/fedmsg/hub/tasks/main.yml b/roles/fedmsg/hub/tasks/main.yml index f669f66363..58fcaf4bc9 100644 --- a/roles/fedmsg/hub/tasks/main.yml +++ b/roles/fedmsg/hub/tasks/main.yml @@ -5,31 +5,31 @@ package: name=fedmsg-hub state=present tags: - packages - when: "'python34-fedmsg' not in group_names and ansible_distribution_major_version|int < 22" + when: "'python34_fedmsg' not in group_names and ansible_distribution_major_version|int < 22" - name: install needed packages dnf: pkg=fedmsg-hub state=present tags: - packages - when: "'python34-fedmsg' not in group_names and ansible_distribution_major_version|int > 21" + when: "'python34_fedmsg' not in group_names and ansible_distribution_major_version|int > 21" - name: install the python34 fedmsg package (yum) package: name=python34-fedmsg-core state=present - when: "'python34-fedmsg' in group_names and ansible_distribution_major_version|int < 22" + when: "'python34_fedmsg' in group_names and ansible_distribution_major_version|int < 22" tags: fedmsg/base - name: install the python3 fedmsg package (dnf) dnf: pkg=python3-fedmsg state=present - when: "'python34-fedmsg' in group_names and ansible_distribution_major_version|int > 21" + when: "'python34_fedmsg' in group_names and ansible_distribution_major_version|int > 21" tags: fedmsg/base - name: fedmsg-hub service service: name=fedmsg-hub state=started enabled=yes - when: "'python34-fedmsg' not in group_names" + when: "'python34_fedmsg' not in group_names" - name: fedmsg-hub-3 service service: name=fedmsg-hub-3 state=started enabled=yes - when: "'python34-fedmsg' in group_names" + when: "'python34_fedmsg' in group_names" - name: enable the websocket server if we should copy: src=websockets.py dest=/etc/fedmsg.d/websockets.py diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 3e45062e11..bf3232c2af 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -2,7 +2,7 @@ ; The number of seconds to sleep between tasks ; sleeptime=15 -{% if host in groups['buildvm-s390x'] and host in groups['runroot'] %} +{% if host in groups['buildvm_s390x'] and host in groups['runroot'] %} ; The maximum number of jobs that kojid will handle at a time maxjobs=1 {% else %} @@ -33,10 +33,10 @@ use_createrepo_c=True ; So, up this to 24 hours so we have time to look at failures. failed_buildroot_lifetime=86400 -{% if host in groups['buildvm-s390x'] %} +{% if host in groups['buildvm_s390x'] %} # s390x builders use a local varnish cache topurl = http://kojipkgs-cache01.s390.fedoraproject.org https://kojipkgs01.fedoraproject.org https://kojipkgs02.fedoraproject.org -{% elif host in groups['buildvm-s390x-stg'] %} +{% elif host in groups['buildvm_s390x_stg'] %} # s390x staging builder uses a local varnish cache topurl = http://kojipkgs-cache01.stg.s390.fedoraproject.org {{koji_topurl}} {% elif koji_topurl == 'https://kojipkgs.fedoraproject.org/' %} diff --git a/roles/mirrormanager/backend/templates/create_maps.sh b/roles/mirrormanager/backend/templates/create_maps.sh index 2fe0bdc8bf..9b3aaf4006 100644 --- a/roles/mirrormanager/backend/templates/create_maps.sh +++ b/roles/mirrormanager/backend/templates/create_maps.sh @@ -2,7 +2,7 @@ WORLDMAP="/usr/bin/mm2_generate-worldmap" -FRONTENDS="{% for host in groups['mm-frontend'] %} {{ host }} {% endfor %}" +FRONTENDS="{% for host in groups['mm_frontend'] %} {{ host }} {% endfor %}" OUTPUT=`mktemp -d` diff --git a/roles/mirrormanager/backend/templates/create_statistics.sh b/roles/mirrormanager/backend/templates/create_statistics.sh index 73200ef0e1..929db9f447 100644 --- a/roles/mirrormanager/backend/templates/create_statistics.sh +++ b/roles/mirrormanager/backend/templates/create_statistics.sh @@ -1,7 +1,7 @@ #!/bin/sh -MIRRORLIST_PROXIES="{% for host in groups['mirrorlist-proxies'] %} {{ host }} {% endfor %}" -FRONTENDS="{% for host in groups['mm-frontend'] %} {{ host }} {% endfor %}" +MIRRORLIST_PROXIES="{% for host in groups['mirrorlist_proxies'] %} {{ host }} {% endfor %}" +FRONTENDS="{% for host in groups['mm_frontend'] %} {{ host }} {% endfor %}" INPUT="/var/log/mirrormanager/mirrorlist.log" CONTAINER1="/var/log/mirrormanager/mirrorlist1.service.log" diff --git a/roles/mirrormanager/backend/templates/handle_propagation.sh b/roles/mirrormanager/backend/templates/handle_propagation.sh index 11e19cf7bf..a3b2209b0c 100644 --- a/roles/mirrormanager/backend/templates/handle_propagation.sh +++ b/roles/mirrormanager/backend/templates/handle_propagation.sh @@ -5,7 +5,7 @@ PROPAGATION="/usr/bin/mm2_propagation" SOURCE="mm-crawler01.phx2.fedoraproject.org::propagation" LOGBASE="/var/log/mirrormanager/propagation" -FRONTENDS="{% for host in groups['mm-frontend'] %} {{ host }} {% endfor %}" +FRONTENDS="{% for host in groups['mm_frontend'] %} {{ host }} {% endfor %}" OUTPUT=`mktemp -d` ACTIVE=`mktemp` diff --git a/roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh b/roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh index dddd94fed9..c05a62b30a 100644 --- a/roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh +++ b/roles/mirrormanager/backend/templates/sync_pkl_to_mirrorlists.sh @@ -2,7 +2,7 @@ # sync also to new mirrorlist containers on proxies -MIRRORLIST_PROXY="{% for host in groups['mirrorlist-proxies'] %} {{ host }} {% endfor %}" +MIRRORLIST_PROXY="{% for host in groups['mirrorlist_proxies'] %} {{ host }} {% endfor %}" for s in ${MIRRORLIST_PROXY}; do rsync -az --delete-delay --delay-updates --delete /var/lib/mirrormanager/{*pkl,*txt} ${s}:/srv/mirrorlist/data/mirrorlist1/ diff --git a/roles/mirrormanager/frontend2/templates/sync-crawler-logs.sh b/roles/mirrormanager/frontend2/templates/sync-crawler-logs.sh index 1ca8a93acd..1ceb0a699a 100644 --- a/roles/mirrormanager/frontend2/templates/sync-crawler-logs.sh +++ b/roles/mirrormanager/frontend2/templates/sync-crawler-logs.sh @@ -1,6 +1,6 @@ #!/bin/bash -CRAWLERS="{% for host in groups['mm-crawler'] %} {{ host }} {% endfor %}" +CRAWLERS="{% for host in groups['mm_crawler'] %} {{ host }} {% endfor %}" for i in ${CRAWLERS}; do rsync -aq ${i}::crawler/*log /var/log/mirrormanager/crawler/ diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index 0259a43cae..255b7ebfb1 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -23,7 +23,7 @@ tags: - packages - nagios_client - when: "'mailman' in group_names or 'mirrorlist-proxies' in group_names" + when: "'mailman' in group_names or 'mirrorlist_proxies' in group_names" - name: install local nrpe check scripts that are not packaged copy: src="scripts/{{ item }}" dest="{{ libdir }}/nagios/plugins/{{ item }}" mode=0755 owner=nagios group=nagios diff --git a/roles/nagios_client/templates/nrpe.cfg.j2 b/roles/nagios_client/templates/nrpe.cfg.j2 index 8ec106f594..102f5290f7 100644 --- a/roles/nagios_client/templates/nrpe.cfg.j2 +++ b/roles/nagios_client/templates/nrpe.cfg.j2 @@ -205,7 +205,7 @@ include_dir=/etc/nrpe.d/ command[check_users]={{ libdir }}/nagios/plugins/check_users -w 5 -c 10 command[check_load]={{ libdir }}/nagios/plugins/check_load -w 15,10,5 -c 30,25,20 command[check_hda1]={{ libdir }}/nagios/plugins/check_disk -w 20% -c 10% -p /dev/hda1 -{% if inventory_hostname not in groups['zombie-infested'] %} +{% if inventory_hostname not in groups['zombie_infested'] %} command[check_zombie_procs]={{ libdir }}/nagios/plugins/check_procs -w 5 -c 10 -s Z {% else %} # This host is prone to Zombies and we do not care or want to alert on it so we make the limits very high diff --git a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 index e4e745f94d..bce9967c24 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/all-external.cfg.j2 @@ -1,20 +1,20 @@ define hostgroup { hostgroup_name dns alias DNS Servers - members {% for host in groups["dns-external"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %} + members {% for host in groups["dns_external"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %} } define hostgroup { hostgroup_name smtp-mm alias SMTP MailMan Servers - members {% for host in groups["smtp-mm"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %} + members {% for host in groups["smtp_mm"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %} } define hostgroup { hostgroup_name proxies alias Web Servers - members {% for host in groups["proxies-external"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %} + members {% for host in groups["proxies_external"]|sort %} {{ hostvars[host]["inventory_hostname_short"] }}.fedoraproject.org {% if not loop.last %}, {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 index 80f9c54e32..0000bbe2a4 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name bodhi alias Bodhi - members {% for host in groups['proxies'] %}{{host}}, http-bodhi2 {% if not loop.last %} , {% endif %} {% endfor %} + members {% for host in groups['proxies'] %}{{host}}, http_bodhi2 {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 index dec5c20378..7306ad7989 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name fas alias Fedora Account System - members {% for host in groups['proxies'] %}{{host}}, http-accounts, {% endfor %}{% for host in groups['fas'] %}{{host}}, http-accounts, {% endfor %} db-fas01.phx2.fedoraproject.org,Check FAS DB + members {% for host in groups['proxies'] %}{{host}}, http_accounts, {% endfor %}{% for host in groups['fas'] %}{{host}}, http_accounts, {% endfor %} db_fas01.phx2.fedoraproject.org,Check FAS DB } diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 index ae5baeb325..ba73af7637 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name fp-wiki alias Fedora Project Wiki - members {% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki , {% endfor %}{% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki-non-cached {% if not loop.last %} , {% endif %} {% endfor %} + members {% for host in groups['proxies'] %}{{host}}, http_fedoraproject.org_wiki , {% endfor %}{% for host in groups['proxies'] %}{{host}}, http_fedoraproject.org_wiki_non_cached {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 index 570d1f2727..0dba014c19 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name freemedia alias FreeMedia - members {% for host in groups['sundries'] %}{{host}}, http-freemedia-internal {% if not loop.last %} , {% endif %} {% endfor %} + members {% for host in groups['sundries'] %}{{host}}, http_freemedia_internal {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 index bd78bd7e42..6330bd8179 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name mirrorlist alias Mirrorlist - members {% for host in groups['proxies'] %}{{host}}, http-mirrors.fedoraproject.org-mirrorlist {% if not loop.last %} , {% endif %} {% endfor %} + members {% for host in groups['proxies'] %}{{host}}, http_mirrors.fedoraproject.org_mirrorlist {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/services/mirrorlist-proxies.cfg.j2 b/roles/nagios_server/templates/nagios/services/mirrorlist-proxies.cfg.j2 index ee8050ae02..30e28e3829 100644 --- a/roles/nagios_server/templates/nagios/services/mirrorlist-proxies.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/mirrorlist-proxies.cfg.j2 @@ -1,4 +1,4 @@ -{% for host in groups['mirrorlist-proxies'] %} +{% for host in groups['mirrorlist_proxies'] %} define service { host_name {{ host }} service_description {{ host }} mirrorlist docker container diff --git a/roles/openqa/server/templates/exports.j2 b/roles/openqa/server/templates/exports.j2 index 191d2b4001..8fcdad2dcf 100644 --- a/roles/openqa/server/templates/exports.j2 +++ b/roles/openqa/server/templates/exports.j2 @@ -1 +1 @@ -/var/lib/openqa/share *(ro,insecure,all_squash) {% for host in groups['openqa-hdds-workers'] %} {{ host }}(rw,insecure,no_root_squash) {% endfor %} +/var/lib/openqa/share *(ro,insecure,all_squash) {% for host in groups['openqa_hdds_workers'] %} {{ host }}(rw,insecure,no_root_squash) {% endfor %} diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml index 39c0285d14..961b2638cc 100644 --- a/roles/openqa/worker/tasks/main.yml +++ b/roles/openqa/worker/tasks/main.yml @@ -92,7 +92,7 @@ - config - import_tasks: createhdds.yml - when: "inventory_hostname in groups['openqa-hdds-workers']" + when: "inventory_hostname in groups['openqa_hdds_workers']" - name: Enable and start worker services service: name=openqa-worker@{{ item }} enabled=yes state=started diff --git a/roles/postgresql_server_bdr/templates/pg_hba.conf b/roles/postgresql_server_bdr/templates/pg_hba.conf index 63f3fa93a9..6257f38728 100644 --- a/roles/postgresql_server_bdr/templates/pg_hba.conf +++ b/roles/postgresql_server_bdr/templates/pg_hba.conf @@ -81,7 +81,7 @@ host all all 10.5.128.99/32 trust host replication all 10.5.128.98/32 trust host replication all 10.5.128.99/32 trust # staging replication hosts -{% for host in groups['pgbdr-stg']|sort %} +{% for host in groups['pgbdr_stg']|sort %} {% if 'eth0_ip' in hostvars[host] %}# {{ host }} host replication all {{ hostvars[host]['eth0_ip'] }}/32 md5 {% else %}# {{ host }} has no 'eth0_ip' listed diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index 6d38ba4bf3..ef86e1d0bd 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -101,7 +101,7 @@ dnf: state=present pkg={{ item }} with_items: - pungi-utils - when: "'releng-compose' in group_names" + when: "'releng_compose' in group_names" - name: Custom compose-koji template: src=compose-koji.j2 dest=/usr/bin/compose-koji @@ -112,13 +112,13 @@ - name: make a mnt/koji link file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji - when: "'releng-compose' in group_names or 'releng-stg' in group_names" + when: "'releng_compose' in group_names or 'releng_stg' in group_names" - name: add pkgs for nightly compose package: state=present pkg={{ item }} with_items: - packagedb-cli - when: "'releng-compose' in group_names" + when: "'releng_compose' in group_names" # Add skopeo for OCI Image management, only in stage first for testing - name: add pkgs for OCI Image management diff --git a/roles/rkhunter/templates/rkhunter.conf.j2 b/roles/rkhunter/templates/rkhunter.conf.j2 index f01c3962ce..65efe9a34c 100644 --- a/roles/rkhunter/templates/rkhunter.conf.j2 +++ b/roles/rkhunter/templates/rkhunter.conf.j2 @@ -403,17 +403,17 @@ ALLOWDEVFILE=/dev/shm/squid-cf__readers.shm ALLOWDEVFILE=/dev/shm/squid-cf__queues.shm ALLOWDEVFILE=/dev/shm/squid-cf__metadata.shm {% endif %} -{% if inventory_hostname in groups['virtservers'] or inventory_hostname in groups['openqa-workers'] or inventory_hostname in groups['openqa-stg-workers'] or inventory_hostname in groups['taskotron-stg-client-hosts'] or inventory_hostname in groups['taskotron-dev-client-hosts'] %} +{% if inventory_hostname in groups['virtservers'] or inventory_hostname in groups['openqa_workers'] or inventory_hostname in groups['openqa_stg_workers'] or inventory_hostname in groups['taskotron_stg_client_hosts'] or inventory_hostname in groups['taskotron_dev_client_hosts'] %} # libvirt spice device makes a /dev/shm/spice file ALLOWDEVFILE=/dev/shm/spice.* {% endif %} -{% if inventory_hostname in groups['ipa'] or inventory_hostname in groups['ipa-stg'] %} +{% if inventory_hostname in groups['ipa'] or inventory_hostname in groups['ipa_stg'] %} ALLOWDEVFILE=/dev/shm/sem.slapd*.stats {% endif %} -{% if inventory_hostname in groups['proxies'] or inventory_hostname in groups['proxies-stg'] %} +{% if inventory_hostname in groups['proxies'] or inventory_hostname in groups['proxies_stg'] %} ALLOWDEVFILE=/dev/shm/libpod_lock {% endif %} -{% if inventory_hostname in groups['pgbdr'] or inventory_hostname in groups['pgbdr-stg'] or inventory_hostname == 'ci-cc-rdu01.fedoraproject.org' or inventory_hostname == 'hubs01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-koji01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db-qa03.qa.fedoraproject.org' %} +{% if inventory_hostname in groups['pgbdr'] or inventory_hostname in groups['pgbdr_stg'] or inventory_hostname == 'ci_cc_rdu01.fedoraproject.org' or inventory_hostname == 'hubs01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db_koji01.stg.phx2.fedoraproject.org' or inventory_hostname == 'db_qa03.qa.fedoraproject.org' %} ALLOWDEVFILE=/dev/shm/PostgreSQL* {% endif %} @@ -627,7 +627,7 @@ OS_VERSION_FILE=/etc/{{ ansible_distribution|lower }}-release # #RTKT_DIR_WHITELIST="" #RTKT_FILE_WHITELIST="" -{% if inventory_hostname in groups['ipa'] or inventory_hostname in groups['ipa-stg'] %} +{% if inventory_hostname in groups['ipa'] or inventory_hostname in groups['ipa_stg'] %} RTKT_FILE_WHITELIST="/var/log/pki/pki-tomcat/ca/system" RTKT_FILE_WHITELIST="/var/log/pki/pki-tomcat/kra/system" {% endif %} diff --git a/tasks/virt_instance_create.yml b/tasks/virt_instance_create.yml index 5e226648e6..3e74153004 100644 --- a/tasks/virt_instance_create.yml +++ b/tasks/virt_instance_create.yml @@ -99,7 +99,7 @@ with_items: - /root/.ssh/known_hosts - /etc/ssh/ssh_known_hosts - when: inventory_hostname not in result.list_vms and inventory_hostname in groups['osbs-masters-stg']+groups['osbs-nodes-stg'] + when: inventory_hostname not in result.list_vms and inventory_hostname in groups['osbs_masters_stg']+groups['osbs_nodes_stg'] delegate_to: osbs-control01.stg.phx2.fedoraproject.org - name: (osbs-control01) make sure there is no old ssh host key for the host still around @@ -108,7 +108,7 @@ with_items: - /root/.ssh/known_hosts - /etc/ssh/ssh_known_hosts - when: inventory_hostname not in result.list_vms and inventory_hostname in groups['osbs-masters']+groups['osbs-nodes'] + when: inventory_hostname not in result.list_vms and inventory_hostname in groups['osbs_masters']+groups['osbs_nodes'] delegate_to: osbs-control01.phx2.fedoraproject.org - name: wait for ssh on the vm to start back @@ -134,7 +134,7 @@ with_items: - /root/.ssh/known_hosts - /etc/ssh/ssh_known_hosts - when: inventory_hostname not in result.list_vms and inventory_hostname in groups['osbs-masters-stg']+groups['osbs-nodes-stg'] + when: inventory_hostname not in result.list_vms and inventory_hostname in groups['osbs_masters_stg']+groups['osbs_nodes_stg'] delegate_to: osbs-control01.stg.phx2.fedoraproject.org - name: (osbs-control01) add new ssh host key @@ -143,6 +143,6 @@ with_items: - /root/.ssh/known_hosts - /etc/ssh/ssh_known_hosts - when: inventory_hostname not in result.list_vms and inventory_hostname in groups['osbs-masters']+groups['osbs-nodes'] + when: inventory_hostname not in result.list_vms and inventory_hostname in groups['osbs_masters']+groups['osbs_nodes'] delegate_to: osbs-control01.phx2.fedoraproject.org diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml index 0bfbefaf6a..ae6360a952 100644 --- a/tasks/yumrepos.yml +++ b/tasks/yumrepos.yml @@ -121,7 +121,7 @@ - name: add infrastructure tags repo - Fedora copy: src="{{ files }}/common/fedora-infra-tags.repo" dest="/etc/yum.repos.d/infra-tags.repo" - when: ansible_distribution == 'Fedora' and inventory_hostname not in groups['maintainer-test'] + when: ansible_distribution == 'Fedora' and inventory_hostname not in groups['maintainer_test'] tags: - config - packages