diff --git a/inventory/group_vars/basset-stg b/inventory/group_vars/basset-stg index 02049e5279..719efd3e07 100644 --- a/inventory/group_vars/basset-stg +++ b/inventory/group_vars/basset-stg @@ -8,7 +8,7 @@ custom_rules: [ # fas01.stg '-A INPUT -p tcp -m tcp -s 10.5.126.86 --dport 80 -j ACCEPT', # wiki01.stg - '-A INPUT -p tcp -m tcp -s 10.5.126.60 --dport 80 -j ACCEPT', + '-A INPUT -p tcp -m tcp -s 10.5.128.188 --dport 80 -j ACCEPT', ] fas_client_groups: sysadmin-main diff --git a/inventory/host_vars/wiki01.stg.phx2.fedoraproject.org b/inventory/host_vars/wiki01.stg.phx2.fedoraproject.org index 20046c0795..b8ce930bf2 100644 --- a/inventory/host_vars/wiki01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/wiki01.stg.phx2.fedoraproject.org @@ -1,11 +1,11 @@ --- nm: 255.255.255.0 -gw: 10.5.126.254 +gw: 10.5.128.254 dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/ volgroup: /dev/vg_guests -eth0_ip: 10.5.126.60 +eth0_ip: 10.5.128.188 eth1_ip: 10.5.127.42 vmhost: virthost12.phx2.fedoraproject.org datacenter: phx2 diff --git a/roles/basset/frontend/templates/frontend.cfg.j2 b/roles/basset/frontend/templates/frontend.cfg.j2 index 7916babb89..e773b4801b 100644 --- a/roles/basset/frontend/templates/frontend.cfg.j2 +++ b/roles/basset/frontend/templates/frontend.cfg.j2 @@ -1,6 +1,6 @@ [submission_access] {% if env == "staging" %} -10.5.126.60 = mediawiki.new,mediawiki.edit +10.5.128.188 = mediawiki.new,mediawiki.edit 10.5.126.86 = fedora.fas.registration,fedora.fas.cla_sign {% else %} 10.5.126.63 = mediawiki.new,mediawiki.edit diff --git a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts index 172072004a..e5ad5c9d56 100644 --- a/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts +++ b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts @@ -19,7 +19,7 @@ 10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 10.5.125.36 kojipkgs.fedoraproject.org 10.5.126.79 ask01.fedoraproject.org ask01 -10.5.126.60 packages01.phx2.fedoraproject.org pacakges01 packages02 +10.5.128.188 wiki01.fedoraproject.org wiki01 wiki 10.5.128.60 ask01.phx2.fedoraproject.org ask ask01 209.132.183.72 bugzilla.redhat.com 10.5.126.61 paste01.phx2.fedoraproject.org paste01 paste02 diff --git a/roles/varnish/templates/proxies.vcl.j2 b/roles/varnish/templates/proxies.vcl.j2 index a129f2dae7..748fd07827 100644 --- a/roles/varnish/templates/proxies.vcl.j2 +++ b/roles/varnish/templates/proxies.vcl.j2 @@ -149,7 +149,7 @@ backend registry { acl purge { "192.168.1.129"; // wiki01.vpn "192.168.1.130"; // wiki02.vpn - "10.5.126.60"; // wiki01.stg + "10.5.128.188"; // wiki01.stg "10.5.126.63"; // wiki01 "10.5.126.73"; // wiki02 "10.5.126.23"; // lockbox01