diff --git a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org similarity index 68% rename from inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org rename to inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org index e5c0b50f65..4ffbb11b70 100644 --- a/inventory/host_vars/bodhi-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.stg.iad2.fedoraproject.org @@ -1,16 +1,13 @@ --- nm: 255.255.255.0 -gw: 10.5.128.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-32 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/32/Server/x86_64/os/ +gw: 10.3.167.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ volgroup: /dev/vg_guests -virt_install_command: "{{ virt_install_command_two_nic }}" mac_address: 52:54:00:1c:40:15 -eth0_ip: 10.5.128.79 -mac_address1: 52:54:00:5f:29:0f -eth1_ip: 10.5.127.65 -vmhost: virthost02.stg.phx2.fedoraproject.org +eth0_ip: 10.3.167.32 +vmhost: bvmhost-x86-03.stg.iad2.fedoraproject.org # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/inventory b/inventory/inventory index fbea6f4656..bd516c5b89 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -174,7 +174,7 @@ mbs_backend_stg bodhi-backend01.iad2.fedoraproject.org [bodhi_backend_stg] -# bodhi-backend01.stg.iad2.fedoraproject.org +bodhi-backend01.stg.iad2.fedoraproject.org [sign_bridge] sign-bridge01.iad2.fedoraproject.org @@ -214,7 +214,7 @@ db-koji01.stg.iad2.fedoraproject.org # badges-backend01.stg.iad2.fedoraproject.org # badges-web01.stg.iad2.fedoraproject.org # blockerbugs01.stg.iad2.fedoraproject.org -# bodhi-backend01.stg.iad2.fedoraproject.org +bodhi-backend01.stg.iad2.fedoraproject.org # busgateway01.stg.iad2.fedoraproject.org # datagrepper01.stg.iad2.fedoraproject.org # fedocal01.stg.iad2.fedoraproject.org @@ -568,7 +568,7 @@ autosign01.stg.iad2.fedoraproject.org # basset01.stg.iad2.fedoraproject.org # bastion01.stg.iad2.fedoraproject.org # blockerbugs01.stg.iad2.fedoraproject.org -# bodhi-backend01.stg.iad2.fedoraproject.org +bodhi-backend01.stg.iad2.fedoraproject.org # bugzilla2fedmsg01.stg.iad2.fedoraproject.org bvmhost-x86-01.stg.iad2.fedoraproject.org bvmhost-x86-02.stg.iad2.fedoraproject.org diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index bb340a605c..176c1dbc65 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -29,7 +29,7 @@ - nagios_client - collectd/base - hosts - - fas_client + - { role: fas_client, when: env != "staging" } - sudo - rkhunter - fedmsg/base @@ -120,6 +120,7 @@ tags: bodhi when: env == 'staging' - import_tasks: "{{ tasks_path }}/2fa_client.yml" + when: env != "staging" - import_tasks: "{{ tasks_path }}/motd.yml" handlers: