infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

ODCS: Use dedicated sysadmin-odcs group

Browse source
This commit is contained in:
Mikolaj Izdebski 2019-10-22 12:58:02 +02:00 • committed by Pierre-Yves Chibon
parent 1c210abdd3
commit f4ebcc677a
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/batcave
View file

@ -8,7 +8,7 @@ tcp_ports: [ 80, 443, 8442, 8443 ]
# Neeed for rsync from log01 for logs. # Neeed for rsync from log01 for logs.
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
fas_client_groups: sysadmin-ask,sysadmin-atomic,sysadmin-cvs,sysadmin-main,sysadmin-web,sysadmin-noc,sysadmin-hosted,sysadmin-releng,sysadmin-qa,sysadmin-tools,sysadmin-cloud,sysadmin-bot,sysadmin-centos,sysadmin-koschei,sysadmin-datanommer,sysadmin-fedimg,fi-apprentice,sysadmin-regcfp,sysadmin-badges,sysadmin-mbs,sysadmin-veteran,sysadmin-coreos,sysadmin-upstreamfirst,sysadmin-releasemonitoring,sysadmin-fpdc,sysadmin-messaging,sysadmin-libravatar,sysadmin-gnome,sysadmin-copr,sysadmin-osbs fas_client_groups: sysadmin-ask,sysadmin-atomic,sysadmin-cvs,sysadmin-main,sysadmin-web,sysadmin-noc,sysadmin-hosted,sysadmin-releng,sysadmin-qa,sysadmin-tools,sysadmin-cloud,sysadmin-bot,sysadmin-centos,sysadmin-koschei,sysadmin-datanommer,sysadmin-fedimg,fi-apprentice,sysadmin-regcfp,sysadmin-badges,sysadmin-mbs,sysadmin-veteran,sysadmin-coreos,sysadmin-upstreamfirst,sysadmin-releasemonitoring,sysadmin-fpdc,sysadmin-messaging,sysadmin-libravatar,sysadmin-gnome,sysadmin-copr,sysadmin-osbs,sysadmin-odcs
ansible_base: /srv/web/infra ansible_base: /srv/web/infra
freezes: false freezes: false

2
inventory/group_vars/odcs_backend
View file

@ -31,7 +31,7 @@ nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
# Neeed for rsync from log01 for logs. # Neeed for rsync from log01 for logs.
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran
fedmsg_hub_auto_restart: True fedmsg_hub_auto_restart: True
fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}" fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"

2
inventory/group_vars/odcs_backend_stg
View file

@ -33,7 +33,7 @@ nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
# Neeed for rsync from log01 for logs. # Neeed for rsync from log01 for logs.
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran
fedmsg_hub_auto_restart: True fedmsg_hub_auto_restart: True
fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}" fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"

2
inventory/group_vars/odcs_frontend
View file

@ -26,7 +26,7 @@ udp_ports: [ 111 ]
# Neeed for rsync from log01 for logs. # Neeed for rsync from log01 for logs.
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran
# These are consumed by a task in roles/fedmsg/base/main.yml # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

2
inventory/group_vars/odcs_frontend_stg
View file

@ -26,7 +26,7 @@ udp_ports: [ 111 ]
# Neeed for rsync from log01 for logs. # Neeed for rsync from log01 for logs.
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-odcs,sysadmin-veteran
# These are consumed by a task in roles/fedmsg/base/main.yml # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

4
roles/odcs/base/defaults/main.yml
View file

@ -5,9 +5,9 @@ odcs_pdc_insecure: False
odcs_pdc_develop: True odcs_pdc_develop: True
odcs_target_dir: /srv/odcs odcs_target_dir: /srv/odcs
odcs_target_dir_url: http://{{ inventory_hostname }}/composes odcs_target_dir_url: http://{{ inventory_hostname }}/composes
odcs_allowed_clients_groups: {"sysadmin-mbs": {}, "sysadmin-osbs": {}, "packager": {"source_types": ["module"]}} odcs_allowed_clients_groups: {"sysadmin-odcs": {}, "packager": {"source_types": ["module"]}}
odcs_allowed_clients_users: {"osbs@service": {}} odcs_allowed_clients_users: {"osbs@service": {}}
odcs_admin_groups: ["sysadmin-mbs"] odcs_admin_groups: ["sysadmin-odcs"]
odcs_admin_users: [] odcs_admin_users: []
odcs_raw_config_urls: {} odcs_raw_config_urls: {}
odcs_pungi_runroot_enabled: False odcs_pungi_runroot_enabled: False