dkirwan/infra-ansible
1
0
Fork 0
forked from infra/ansible
Code Pull requests Activity

Add bodhi-backend01.stg and adjust value01

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2025-07-09 16:00:08 -07:00
commit 70c633121e
10 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/backups
View file

@ -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

7
inventory/host_vars/bodhi-backend01.stg.rdu3.fedoraproject.org Normal file
View file

@ -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

4
roles/nagios_server/files/nagios/commands/notify.cfg
View file

@ -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

4
roles/nagios_server/files/nagios/plugins/restart_httpd
View file

@ -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
;;

4
roles/nagios_server/files/nagios/plugins/restart_rsyslog
View file

@ -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
;;

2
roles/openshift-apps/mote/templates/pvc.yml.j2
View file

@ -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:

2
roles/supybot/files/ursabot.service
View file

@ -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

2
roles/supybot/files/zodbot.service
View file

@ -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

22
roles/supybot/tasks/main.yml
View file

@ -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

2
roles/web-data-analysis/templates/sync-http-logs.yaml.j2
View file

@ -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