Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Peter Robinson 2015-07-29 19:49:02 +00:00
commit c9eac0bb2f
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/backups
View file

@ -14,8 +14,7 @@ pagure01.fedoraproject.org
people01.fedoraproject.org
pkgs02.phx2.fedoraproject.org
log01.phx2.fedoraproject.org
# re-add this once we have rhit firewall allowing it
#qadevel.qa.fedoraproject.org:222
qadevel.qa.fedoraproject.org:222
db-qa01.qa.fedoraproject.org
db-koji01.phx2.fedoraproject.org
copr-be.cloud.fedoraproject.org

4
roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
View file

@ -21,11 +21,11 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
option host-name "virthost02";
}
host virthost04 {
host atomic-qa01 {
hardware ethernet e4:1f:13:ba:84:d0;
fixed-address 10.5.126.144;
next-server 10.5.126.41;
option host-name "virthost04";
option host-name "atomic-qa01";
filename "pxelinux.0";
}

4
roles/dhcp_server/files/dhcpd.conf.noc03.phx2.fedoraproject.org
View file

@ -25,11 +25,11 @@ subnet 10.5.126.0 netmask 255.255.255.0 {
option host-name "virthost02";
}
host virthost04 {
host atomic-qa01 {
hardware ethernet e4:1f:13:ba:84:d0;
fixed-address 10.5.126.144;
next-server 10.5.126.41;
option host-name "virthost04";
option host-name "atomic-qa01";
filename "pxelinux.0";
}

19
roles/fedmsg/irc/templates/ircbot.py
View file

@ -174,6 +174,25 @@ config = dict(
),
),
# And for #fedora-g11n
dict(
network='chat.freenode.net',
port=6667,
make_pretty=True,
make_terse=True,
{% if env == 'staging' %}
nickname='fedmsg-g11n-stg',
{% else %}
nickname='fedmsg-g11n',
{% endif %}
channel='#fedora-g11n',
# If the word G11N appears in any message, forward it.
filters=dict(
body=['^((?!G11N).)*$'],
),
),
# Hook up the design-team with badges messages
dict(
network='chat.freenode.net',