From 88912de589880ed15f6e987588df1c8c5cf5fcf9 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Wed, 18 Nov 2015 18:05:38 +0000 Subject: [PATCH] remove openqa-stg01.qa from staging group so that it can easily talk to prod koji and wiki --- inventory/group_vars/openqa-stg | 11 ++++++++++ inventory/inventory | 4 ++-- .../openqa-stg01.qa.fedoraproject.org-hosts | 20 ------------------- 3 files changed, 13 insertions(+), 22 deletions(-) delete mode 100644 roles/hosts/files/openqa-stg01.qa.fedoraproject.org-hosts diff --git a/inventory/group_vars/openqa-stg b/inventory/group_vars/openqa-stg index a1a5337686..c7359a7896 100644 --- a/inventory/group_vars/openqa-stg +++ b/inventory/group_vars/openqa-stg @@ -1,3 +1,14 @@ +# This setup is a bit out of the ordinary for a staging system. As the openqa +# scheduler needs up-to-date information from the wiki and koji, it doens't +# work well as a proper staging host. +# +# We decided to keep it a pseudo-staging host that will get new versions of +# openqa first and will be a staging host for most intensive purposes but from +# a firewall rule POV, it will be a staging-friendly production host +# +# it should still be using the stg proxies and the external hostname will still +# be stg.fedoraproject.org + external_hostname: openqa.stg.fedoraproject.org openqa_hostname: localhost diff --git a/inventory/inventory b/inventory/inventory index 0ce24eabe5..d2fc4ac241 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -489,6 +489,7 @@ openqa01.qa.fedoraproject.org qa05.qa.fedoraproject.org qa06.qa.fedoraproject.org +# openqa-stg and openqa-stg-workers are pseudo-stg, see group_vars/openqa-stg for more details [openqa-stg] openqa-stg01.qa.fedoraproject.org @@ -631,8 +632,6 @@ mm-frontend01.stg.phx2.fedoraproject.org mm-backend01.stg.phx2.fedoraproject.org mm-crawler01.stg.phx2.fedoraproject.org beaker-stg01.qa.fedoraproject.org -openqa-stg01.qa.fedoraproject.org -qa07.qa.fedoraproject.org # This is a list of hosts that are a little "friendly" with staging. # They are exempted from the iptables wall between staging and prod. @@ -649,6 +648,7 @@ ns03.phx2.fedoraproject.org ns04.phx2.fedoraproject.org db-qa01.qa.fedoraproject.org proxy10.phx2.fedoraproject.org +openqa-stg01.qa.fedoraproject.org [statscache:children] statscache-web diff --git a/roles/hosts/files/openqa-stg01.qa.fedoraproject.org-hosts b/roles/hosts/files/openqa-stg01.qa.fedoraproject.org-hosts deleted file mode 100644 index 40bca182ba..0000000000 --- a/roles/hosts/files/openqa-stg01.qa.fedoraproject.org-hosts +++ /dev/null @@ -1,20 +0,0 @@ -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 - -# this is basically the same thing as stg but for openqa scheduling, we need -# access to the production wiki so fedoraproject.org isn't redirected to -# proxy01.stg -10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 proxy05 proxy06 proxy07 proxy08 proxy09 proxy10 proxy11 admin.fedoraproject.org admin.stg.fedoraproject.org apps.fedoraproject.org apps.stg.fedoraproject.org -10.5.126.23 infrastructure.fedoraproject.org -10.5.126.83 pkgs.fedoraproject.org -10.5.126.210 memcached01.stg.phx2.fedoraproject.org memcached01 memcached02 memcached03 memcached04 -10.5.126.85 db02.stg.fedoraproject.org -10.5.126.113 db05 -10.5.126.204 db01.stg.phx2.fedoraproject.org db-ask db-elections db-koji01 db-datanommer db-datanommer01 db-datanommer02 db-datanommer02.phx2.fedoraproject.org db-github2fedmsg db-fedocal tagger_db db-pkgdb2 db-summershum db-tahrir nuancier_db db-notifs db-blockerbugs db-kerneltest -10.5.126.86 fas01.stg.phx2.fedoraproject.org fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all - -# openqa scheduling relies on data from koji and kojipkgs and the data in -# koji.stg is too old to be useful -# this doesn't actually work due to firewalling -#10.5.125.63 koji.fedoraproject.org -#10.5.125.36 kojipkgs.fedoraproject.org