From 592fffe808a3c019aa9df41a994dec78f6e90785 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 6 Oct 2018 21:33:10 +0000 Subject: [PATCH] drop this refrence too --- master.yml | 110 +++++++++--------- .../templates/nagios/services/websites.cfg.j2 | 7 -- 2 files changed, 55 insertions(+), 62 deletions(-) diff --git a/master.yml b/master.yml index 776d88d3db..e0300c9bcd 100644 --- a/master.yml +++ b/master.yml @@ -12,61 +12,61 @@ # # group playbooks # -- import_playbook: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/backup-server.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/basset.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml -#- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugyou.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/certgetter.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/ci.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend-cloud.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/oci-registry.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/fas.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedimg.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/freshmaker.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/hotness.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/infinote.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipa.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipsilon.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/kojipkgs.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-backend.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-web.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/logserver.yml -#- import_playbook: /srv/web/infra/ansible/playbooks/groups/loopabull.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/mbs.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/mailman.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/mdapi.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/mirrormanager.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/memcached.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/backup-server.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/basset.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml +##- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugyou.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/certgetter.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/ci.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend-cloud.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/oci-registry.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/fas.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedimg.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/freshmaker.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/hotness.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/infinote.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipa.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipsilon.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/kojipkgs.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-backend.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/koschei-web.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/logserver.yml +##- import_playbook: /srv/web/infra/ansible/playbooks/groups/loopabull.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mbs.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mailman.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mdapi.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mirrormanager.yml +#- import_playbook: /srv/web/infra/ansible/playbooks/groups/memcached.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/modernpaste.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/noc.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-backend.yml diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index 0bcab6d3eb..e90027c217 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -157,13 +157,6 @@ define service { ## ## Other Frontend Websites -define service { - hostgroup_name anitya-frontend - service_description http-release-monitoring.org-anitya - check_command check_website_ssl!release-monitoring.org!/!Anitya - use websitetemplate -} - define service { hostgroup_name autocloud-web service_description http-autocloud-internal