diff --git a/inventory/backups b/inventory/backups index 9e61899040..c24b962e40 100644 --- a/inventory/backups +++ b/inventory/backups @@ -15,6 +15,6 @@ pkgs01.rdu3.fedoraproject.org log01.rdu3.fedoraproject.org db-openqa01.rdu3.fedoraproject.org db-koji01.rdu3.fedoraproject.org -value02.rdu3.fedoraproject.org +value01.rdu3.fedoraproject.org tang01.rdu3.fedoraproject.org ipa01.rdu3.fedoraproject.org diff --git a/inventory/host_vars/bodhi-backend01.stg.rdu3.fedoraproject.org b/inventory/host_vars/bodhi-backend01.stg.rdu3.fedoraproject.org new file mode 100644 index 0000000000..5d5203c9b9 --- /dev/null +++ b/inventory/host_vars/bodhi-backend01.stg.rdu3.fedoraproject.org @@ -0,0 +1,7 @@ +--- +eth0_ipv4_gw: 10.16.167.254 +eth0_ipv4_ip: 10.16.167.32 +ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ +ks_url: https://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-fedora +vmhost: bvmhost-x86-01.stg.rdu3.fedoraproject.org +volgroup: /dev/vg_guests diff --git a/roles/nagios_server/files/nagios/commands/notify.cfg b/roles/nagios_server/files/nagios/commands/notify.cfg index 2536d45b3e..e3b543490a 100644 --- a/roles/nagios_server/files/nagios/commands/notify.cfg +++ b/roles/nagios_server/files/nagios/commands/notify.cfg @@ -31,7 +31,7 @@ define command{ # 'host-notify-by-ircbot' command definition define command{ command_name host-notify-by-ircbot - command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTNAME$ is $HOSTSTATE$: $HOSTOUTPUT$ ($$(hostname -s)) $HOSTACKAUTHOR$ $SERVICEACKAUTHOR$" | /usr/local/bin/irc-colorize.py | nc -w 1 value02 5050 + command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTNAME$ is $HOSTSTATE$: $HOSTOUTPUT$ ($$(hostname -s)) $HOSTACKAUTHOR$ $SERVICEACKAUTHOR$" | /usr/local/bin/irc-colorize.py | nc -w 1 value01 5050 } # 'host-notify-by-matrixbot' command definition @@ -49,7 +49,7 @@ define command{ # 'notify-by-ircbot' command definition define command{ command_name notify-by-ircbot - command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTNAME$/$SERVICEDESC$ is $SERVICESTATE$: $SERVICEOUTPUT$ ($$(hostname -s)) $HOSTACKAUTHOR$ $SERVICEACKAUTHOR$" | /usr/local/bin/irc-colorize.py | nc -w 1 value02 5050 + command_line /usr/bin/printf "%b" "#fedora-noc $NOTIFICATIONTYPE$ - $HOSTNAME$/$SERVICEDESC$ is $SERVICESTATE$: $SERVICEOUTPUT$ ($$(hostname -s)) $HOSTACKAUTHOR$ $SERVICEACKAUTHOR$" | /usr/local/bin/irc-colorize.py | nc -w 1 value01 5050 } # 'notify-by-matrixbot' command definition diff --git a/roles/nagios_server/files/nagios/plugins/restart_httpd b/roles/nagios_server/files/nagios/plugins/restart_httpd index 7cbb09ce44..f461f45553 100755 --- a/roles/nagios_server/files/nagios/plugins/restart_httpd +++ b/roles/nagios_server/files/nagios/plugins/restart_httpd @@ -49,7 +49,7 @@ CRITICAL) 2) echo -n "Restarting HTTP service (3rd soft critical state)..." # Call the init script to restart the HTTPD server - echo "#fedora-noc $hostalias - Attempting to reload httpd. $servicedesc is $servicestate (2nd check)" | /usr/bin/nc -w 1 value02 5050 + echo "#fedora-noc $hostalias - Attempting to reload httpd. $servicedesc is $servicestate (2nd check)" | /usr/bin/nc -w 1 value01 5050 /usr/lib64/nagios/plugins/check_nrpe -H $remotehost -c service_httpd_reload ;; esac @@ -62,7 +62,7 @@ CRITICAL) # point (unless you disabled notifications for this service) HARD) echo -n "Restarting HTTP service..." - echo "#fedora-noc $hostalias - Attempting to reload httpd. $servicedesc is $servicestate" | /usr/bin/nc -w 1 value02 5050 + echo "#fedora-noc $hostalias - Attempting to reload httpd. $servicedesc is $servicestate" | /usr/bin/nc -w 1 value01 5050 # Call the init script to restart the HTTPD server /usr/lib64/nagios/plugins/check_nrpe -H $remotehost -c service_httpd_restart ;; diff --git a/roles/nagios_server/files/nagios/plugins/restart_rsyslog b/roles/nagios_server/files/nagios/plugins/restart_rsyslog index a2e44e43de..2ece8a3e42 100755 --- a/roles/nagios_server/files/nagios/plugins/restart_rsyslog +++ b/roles/nagios_server/files/nagios/plugins/restart_rsyslog @@ -49,7 +49,7 @@ CRITICAL) 2) echo -n "Restarting rsyslog service (3rd soft critical state)..." # Call the init script to restart the rsyslog server - echo "#fedora-noc $hostalias - Attempting to reload rsyslog. $servicedesc is $servicestate (2nd check)" | /usr/bin/nc -w 1 value02 5050 + echo "#fedora-noc $hostalias - Attempting to reload rsyslog. $servicedesc is $servicestate (2nd check)" | /usr/bin/nc -w 1 value01 5050 /usr/lib64/nagios/plugins/check_nrpe -H $remotehost -c service_rsyslog_reload ;; esac @@ -62,7 +62,7 @@ CRITICAL) # point (unless you disabled notifications for this service) HARD) echo -n "Restarting rsyslog service..." - echo "#fedora-noc $hostalias - Attempting to restart rsyslog. $servicedesc is $servicestate" | /usr/bin/nc -w 1 value02 5050 + echo "#fedora-noc $hostalias - Attempting to restart rsyslog. $servicedesc is $servicestate" | /usr/bin/nc -w 1 value01 5050 # Call the init script to restart the HTTPD server /usr/lib64/nagios/plugins/check_nrpe -H $remotehost -c service_rsyslog_restart ;; diff --git a/roles/openshift-apps/mote/templates/pvc.yml.j2 b/roles/openshift-apps/mote/templates/pvc.yml.j2 index 80f5702621..1081881e4b 100644 --- a/roles/openshift-apps/mote/templates/pvc.yml.j2 +++ b/roles/openshift-apps/mote/templates/pvc.yml.j2 @@ -4,7 +4,7 @@ kind: PersistentVolumeClaim metadata: name: meetbot-storage spec: - # we use a nfs volume shared with meetbot on value02 + # we use a nfs volume shared with meetbot on value01 accessModes: - ReadWriteMany resources: diff --git a/roles/supybot/files/ursabot.service b/roles/supybot/files/ursabot.service index 2beca268e2..addd3ffdba 100644 --- a/roles/supybot/files/ursabot.service +++ b/roles/supybot/files/ursabot.service @@ -4,7 +4,7 @@ After=network.target [Service] Environment=FEDORA_MESSAGING_CONF=/etc/fedora-messaging/ursabot.toml -Environment=KRB5_CLIENT_KTNAME=/etc/krb5.ursabot_value02.stg.rdu3.fedoraproject.org.keytab +Environment=KRB5_CLIENT_KTNAME=/etc/krb5.ursabot_value01.stg.rdu3.fedoraproject.org.keytab Type=simple User=daemon Group=daemon diff --git a/roles/supybot/files/zodbot.service b/roles/supybot/files/zodbot.service index 957d01b96b..84c4ac4240 100644 --- a/roles/supybot/files/zodbot.service +++ b/roles/supybot/files/zodbot.service @@ -4,7 +4,7 @@ After=network.target [Service] Environment=FEDORA_MESSAGING_CONF=/etc/fedora-messaging/zodbot.toml -Environment=KRB5_CLIENT_KTNAME=/etc/krb5.zodbot_value02.rdu3.fedoraproject.org.keytab +Environment=KRB5_CLIENT_KTNAME=/etc/krb5.zodbot_value01.rdu3.fedoraproject.org.keytab Type=simple User=daemon Group=daemon diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml index e4211bd889..ae7fa3c068 100644 --- a/roles/supybot/tasks/main.yml +++ b/roles/supybot/tasks/main.yml @@ -8,7 +8,7 @@ - supybot-notify - supybot-meetbot - python3-sgmllib3k - when: inventory_hostname.startswith('value02') + when: inventory_hostname.startswith('value01') tags: supybot - set_fact: botname={{ botnames[env] }} @@ -43,7 +43,7 @@ minute: "0" user: apache job: "/usr/local/bin/meetings_by_team.sh" - state: "{{ 'present' if inventory_hostname.startswith('value02') else 'absent' }}" + state: "{{ 'present' if inventory_hostname.startswith('value01') else 'absent' }}" tags: supybot - name: Setup archive script @@ -57,9 +57,9 @@ minute: "30" user: apache job: "/usr/local/bin/archive.sh >& /dev/null" - state: "{{ 'present' if inventory_hostname.startswith('value02') else 'absent' }}" + state: "{{ 'present' if inventory_hostname.startswith('value01') else 'absent' }}" tags: supybot - when: inventory_hostname.startswith('value02') + when: inventory_hostname.startswith('value01') - name: Setup meetbot.conf apache config ansible.builtin.copy: src=meetbot.conf dest=/etc/httpd/conf.d/meetbot.conf mode=644 @@ -102,7 +102,7 @@ user_name: "{{ botnames[env] }}" user_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.meetbot\..* when: - - inventory_hostname.startswith('value02') + - inventory_hostname.startswith('value01') - name: Create /etc/pki/fedora-messaging ansible.builtin.file: @@ -110,7 +110,7 @@ mode: "0775" state: directory when: - - inventory_hostname.startswith('value02') + - inventory_hostname.startswith('value01') tags: - config @@ -122,7 +122,7 @@ owner: daemon group: daemon when: - - inventory_hostname.startswith('value02') + - inventory_hostname.startswith('value01') tags: - config @@ -134,7 +134,7 @@ owner: daemon group: daemon when: - - inventory_hostname.startswith('value02') + - inventory_hostname.startswith('value01') tags: - config @@ -146,7 +146,7 @@ owner: daemon group: daemon when: - - inventory_hostname.startswith('value02') + - inventory_hostname.startswith('value01') tags: - config @@ -158,7 +158,7 @@ group: daemon mode: "0600" when: - - inventory_hostname.startswith('value02') + - inventory_hostname.startswith('value01') tags: - config @@ -173,7 +173,7 @@ - name: Enable zodbot service (prod) service: name=zodbot state=started enabled=true - when: env == "production" and inventory_hostname.startswith('value02') + when: env == "production" and inventory_hostname.startswith('value01') tags: - config - supybot diff --git a/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 b/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 index c824bd4a9e..68c5582d8f 100644 --- a/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 +++ b/roles/web-data-analysis/templates/sync-http-logs.yaml.j2 @@ -38,7 +38,7 @@ synced_hosts: # - blockerbugs01.rdu3.fedoraproject.org # - blockerbugs02.rdu3.fedoraproject.org # - blockerbugs01.stg.rdu3.fedoraproject.org - - value02.rdu3.fedoraproject.org + - value01.rdu3.fedoraproject.org - people01.vpn.fedoraproject.org - noc01.rdu3.fedoraproject.org - dl01.rdu3.fedoraproject.org