1
0
Fork 0
forked from infra/ansible
Commit graph

66 commits

Author SHA1 Message Date
2671d0dd65 bastion: increase size to match up with kickstart
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2026-08-03 16:04:51 -07:00
James Antill
ab631bed2e Merge branch 'upstream' into HEAD
* upstream: (551 commits)

Signed-off-by: James Antill <james@and.org>
2026-05-02 20:02:18 -04:00
James Antill
3821ea36b5 Cleanup nft merge. Chg osbuildapi and nft_custom_rules to use nft_table_filter.
Signed-off-by: James Antill <james@and.org>
2026-05-01 15:29:04 -04:00
276556a4fb refactor: delete fasjson_aliases variable and checks 2026-03-24 17:36:21 +00:00
c5c1fb730f Enable fasjson for email alias creation
Fixes infra/tickets#13219
2026-03-24 17:36:21 +00:00
de1a667f82
Zabbix: Allow for different mailq thresholds using macros
Signed-off-by: Greg Sutcliffe <fedora@emeraldreverie.org>
2025-10-03 11:24:45 +01:00
6c85fda0c9 Mass remove/replace iad2 -> rdu3, 10.3. -> 10.16.
Signed-off-by: Nils Philippsen <nils@redhat.com>
2025-07-03 20:05:02 +02:00
35eadbbf4b bastion: move these to block rules too
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2025-04-29 11:40:13 -07:00
240aa7b8e0 bastion: add sysadmin-riscv
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2025-04-29 09:10:06 -07:00
iamyaash
b3d6a90b9a motd generic template added
migrated notes from infra/hosts

motd changes; excluding CSI infos

removed csi_* vars from group_vars; converted csi_purpose & csi_relationship into notes

fixed merge conflicts

minor changes; var

updating YAMLs & playbooks

udpated YAMLs & playbooks again

updated correctly; buildhw.yml

fixing merge conflicts

dest added in motd.yml
2025-01-28 01:10:14 +00:00
James Antill
80aa4bbbc2 Initial version of iptables to nftables conversion. 2025-01-16 11:28:24 -05:00
f72ff64029 bastion / iptables: Add internal RH mxes and drop global allow
We want to allow internal mx'es to send us email still.
We want to drop the global allow for port 25 now that we hopefully have
all the legit senders listed.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2024-09-24 10:55:20 -07:00
42cae5591f bastion: adjust smtp firewall rules for mimecast
Setup things so we accept smtp connections from all the places we
currently do, but also from mimecast as incoming emails may come via
that. We don't want to globally allow everyone to inject emails here.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2024-09-24 10:36:47 -07:00
81a9f2ceaf bastion: add sysadmin-eln
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2024-07-22 07:54:37 -07:00
679f7f6f16 iptables: clean up osbuild and add a external block set scaffolding
Setup osbuild so it only needs to exist on the specific builders in the
osbuild channel, not all builders.
Also, setup things so we can add a blocklist that will block external
subnets/ip's if we need to do so. Currently it should just be an empty
set, but we can implement it as needed/desired starting with the ips we
already were blocking on just some hosts.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-06-26 12:41:07 -07:00
580cd252c5 Inventory group/host variables: Sort yaml
This was done using yq (
https://mikefarah.gitbook.io/yq/operators/sort-keys )

Doing things this way makes it much easier to see if a variable is set
in a file or if two hosts differ in what variables they set. Hopefully
we can keep things sorted moving forward.

Basically this means just sort a-z anything you add to any host or group
vaiable and it will be in the right place.

Additionally, this enforces 'normal' intent rules for all the variable
files which we should also try and obey. 2 spaces for first level, 3 for
next, etc. When in doubt you can run yq on it.

This should cause NO actual vairable changes, it's all just readability
fixing for humans, ansible parses it exactly the same.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-11-16 13:27:57 -08:00
bcfd447c94 bastion: allow sysadmin-kernel ssh access
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-05-03 15:05:18 -07:00
b0d1ea96da bastion: add fasjson_url for fasjson role
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-03-25 13:47:05 -07:00
46b3fb9390 ipa/client: Revamp combining shell groups
The previous implementation didn't work because of a chicken-and-egg
problem: To add the batcave shell groups to those specifically for
bastion, it needs to look them up, but they aren't set yet (probably
because `batcave` comes after `bastion`).

Now, one can (optionally) set `ipa_client_shell_groups_inherit_from`, a
list of Ansible group names whose `ipa_client_shell_groups` will be
combined with that of the host itself. This is more robust because it's
done late, after variables are set from the inventory.

Signed-off-by: Nils Philippsen <nils@redhat.com>
2021-03-25 13:53:21 +01:00
72b940d31a ipa/client: stopgap for shell groups on bastion
Evaluating ipa_client_shell_group from another group won't work this
way. Hardcode the list until we have a better solution.

Signed-off-by: Nils Philippsen <nils@redhat.com>
2021-03-24 23:56:14 +01:00
Stephen Smoogen
a3fd2875c2 attempt to add sysadmin-qa so that adamw can get some f*ing work done 2021-03-24 15:10:14 -04:00
d93246f23c ipa/client: enable for bastion in prod
Signed-off-by: Nils Philippsen <nils@redhat.com>
2021-03-24 13:44:32 +01:00
b404cb5827 fedora-infrastructure issue/9733: remove dbgserver artifacts from ansible data 2021-03-16 16:23:52 +00:00
7ada76d200 Manage bastion email aliases using fasjson 2021-02-12 16:17:23 +00:00
dbbf94a411 ipa/client: configure global shell access and sudo
Almost global anyway, i.e. inside the VPN.

The ipa/client-based shell access and sudo rules are only effective for
staging right now, the respective playbook bits are masked out for prod.

- Assign Ansible host groups to IPA host groups, the latter don't care
  about 'stg' in the name and use dashes rather than underscores.
- Distill shell access groups from fas_client_groups in group and host
  vars.
- Let all `sysadmin-*` groups in the previous list run anything via sudo
  in the host group (except bastion & batcave).
- Remove `fas_client_groups` from staging host and group vars.
- Remove sudoers from staging host and group vars if only `sysadmin-*`
  groups have shell access.
- Set up `ipa_client_shell_groups` on bastion to be a super set of the
  same on batcave.

Newly created IPA host groups:
- autosign
- badges
- basset
- bastion
- batcave
- blockerbugs
- bodhi
- bugzilla2fedmsg
- busgateway
- datagrepper
- dbserver
- dns
- fedimg
- github2fedmsg
- ipa
- kernel-qa
- kerneltest
- kojibuilder
- kojihub
- kojipkgs
- logging
- mailman
- memcached
- mirrormanager
- nagios
- notifs
- oci-registry
- odcs
- openqa
- openqa-workers
- osbs
- packages
- pdc-web
- pkgs
- proxies
- rabbitmq
- releng-compose
- resultsdb
- secondary
- sign-bridge
- sundries
- value
- wiki

Signed-off-by: Nils Philippsen <nils@redhat.com>
2021-02-01 22:23:41 +00:00
773e025939 bastion: Remove access for modularity-wg group
We have `sysadmin-mbs` now which should cover all people needing access.

Signed-off-by: Nils Philippsen <nils@redhat.com>
2021-02-01 22:23:41 +00:00
ccda608d45 bastion: add sysadmin-kernel to bastion.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2020-07-16 14:25:27 -07:00
Stephen Smoogen
5cd3dea673 change a few known hosts from phx2 to iad2 variables. 2020-06-14 09:51:42 -04:00
Stephen Smoogen
dd43ef9ecf Emergency Patch: the fas_client_groups do not allow spaces between groups. By putting a space between sysadmin-analysis, sysadmin-ask the fas client was trying to find a " sysadmin-ask" which does not exist. This is causing update problems with bastion so having to push this now 2020-04-24 21:34:29 +02:00
Stephen Smoogen
d6c6f6bc8d add sysadmin-analysis to bastion 2020-04-24 21:34:29 +02:00
e1c0ad3bf4 Revert "remove dbgserver from inventory/inventory for nagios and remove sysadmin-dbgserver from bastions"
This reverts commit 299e71b9c587953ddb38558f3361928b00ffb664.
2020-04-24 21:34:21 +02:00
Stephen Smoogen
5f2384713a remove dbgserver from inventory/inventory for nagios and remove sysadmin-dbgserver from bastions 2020-04-24 21:34:21 +02:00
f7c53a386e bastion: Add sysadmin-odcs to fas_client_groups 2020-04-24 21:34:13 +02:00
7fbce5593d Allow sysadmin-osbs to SSH into bastion and batcave
Resolves https://pagure.io/fedora-infrastructure/issue/8182
2020-04-24 21:34:10 +02:00
72c7441cee dbgserver: setup stg server (ticket 7943)
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-07-13 00:00:13 +00:00
9676a0148f Add sysadmin-coreos to bastion
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2019-06-03 15:31:17 +02:00
6054632d42 bastion: add sysadmin-copr
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-05-10 20:26:46 +00:00
d53034cd4b bastion: add sysadmin-gnome to fas groups to allow gnome-sysadmins access to their backup box.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-03-04 17:36:50 +00:00
Stephen Smoogen
330a8e4a1d and this should make our mail easier to read 2018-08-27 22:44:58 +00:00
Stephen Smoogen
28d323bfcf try to make nomail better 2018-08-27 21:44:17 +00:00
Stephen Smoogen
7d793164e7 remove sysadmin-build from hosts 2018-08-22 15:48:13 +00:00
Patrick Uiterwijk
2cf7bacf32 Allow sysadmin-releasemonitoring to bastion
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2018-08-16 08:28:03 +00:00
Tim Flink
5f13672222 adding sysadmin-upstreamfirst to bastion fas_client_groups 2018-06-27 15:39:28 +00:00
Stephen Smoogen
93d2e8f5bb the sysadmin-atomic group will need to run a job 2018-04-12 01:43:31 +00:00
0e494da145 shelve darkserver 2018-04-10 20:36:40 +00:00
Patrick Uiterwijk
f558dee191 Bastion01 and 02 have different hostnamesg
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2017-04-10 10:30:12 +00:00
Patrick Uiterwijk
56ed4718e7 Add some alternative ssh hostnames
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2017-04-09 23:37:15 +00:00
7e5425c2c5 Give sysadmin-mbs access through bastion. 2017-02-23 15:06:46 +00:00
Patrick Uiterwijk
225f27581b Allow pungi-devel to bastion and composer.stg
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2016-07-20 15:10:13 +00:00
6efc52cda6 Also allow modularity-wg on bastion.fp.o. 2016-06-20 13:25:27 +00:00