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

Remove references to the old fedora-packages nodes.

Browse source
This commit is contained in:
Ralph Bean 2014-03-14 19:15:10 +00:00
parent 5c65c352da
commit 31c4afd59c
4 changed files with 8 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
files/releng/fedmsg/endpoints.py
View file

@ -60,12 +60,12 @@ config = dict(
"tcp://fas01.%s:300%i" % (suffix, i) "tcp://fas01.%s:300%i" % (suffix, i)
for i in range(8) for i in range(8)
], ],
"fedoratagger.packages01": [ "fedoratagger.tagger01": [
"tcp://packages01.%s:300%i" % (suffix, i) "tcp://tagger01.%s:300%i" % (suffix, i)
for i in range(8) for i in range(8)
], ],
"fedoratagger.packages02": [ "fedoratagger.tagger02": [
"tcp://packages02.%s:300%i" % (suffix, i) "tcp://tagger02.%s:300%i" % (suffix, i)
for i in range(8) for i in range(8)
], ],
"busmon.app01": [ "busmon.app01": [

13
roles/fedmsg/base/templates/endpoints.py.j2
View file

@ -87,19 +87,6 @@ config = dict(
for i in range(40) for i in range(40)
], ],
{% endif %} {% endif %}
# TODO -- these are the old tagger endpoints that should eventually be
# removed.
"fedoratagger.packages01": [
"tcp://packages01.%s:30%02i" % (suffix, i)
for i in range(32)
],
{% if env != 'staging' %}
"fedoratagger.packages02": [
"tcp://packages02.%s:30%02i" % (suffix, i)
for i in range(32)
],
{% endif %}
# These are the new endpoints, on the new tagger01,2 nodes.
# fedoratagger needs 32 endpoints too, just like FAS. # fedoratagger needs 32 endpoints too, just like FAS.
"fedoratagger.tagger01": [ "fedoratagger.tagger01": [
"tcp://tagger01.%s:30%02i" % (suffix, i) "tcp://tagger01.%s:30%02i" % (suffix, i)

7
roles/fedmsg/base/templates/policy.py.j2
View file

@ -172,16 +172,15 @@ config = dict(
], ],
# Tagger messages # Tagger messages
# TODO -- the old packages01,2 entries here can eventually be removed.
topic_prefix + "fedoratagger.tag.update": [ topic_prefix + "fedoratagger.tag.update": [
"fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3) "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
] + ["fedoratagger-packages0%i.%s" % (i, suffix) for i in range(1, 3)], ],
topic_prefix + "fedoratagger.tag.create": [ topic_prefix + "fedoratagger.tag.create": [
"fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3) "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
] + ["fedoratagger-packages0%i.%s" % (i, suffix) for i in range(1, 3)], ],
topic_prefix + "fedoratagger.user.rank.update": [ topic_prefix + "fedoratagger.user.rank.update": [
"fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3) "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
] + ["fedoratagger-packages0%i.%s" % (i, suffix) for i in range(1, 3)], ],
# Mediawiki messages # Mediawiki messages
topic_prefix + "wiki.article.edit": [ topic_prefix + "wiki.article.edit": [

7
roles/fedmsg/base/templates/ssl.py.j2
View file

@ -52,12 +52,7 @@ config = dict(
for i in range(1, 4) for i in range(1, 4)
] + [ ] + [
("shell.packages0%i" % i, "shell-packages0%i.%s" % (i, suffix)) ("shell.packages0%i" % i, "shell-packages0%i.%s" % (i, suffix))
for i in range(1, 5) for i in range(3, 5)
] + [
# TODO -- this one can be delete eventually once we retired tagger off
# of packages01,2
("fedoratagger.packages0%i" % i, "fedoratagger-packages0%i.%s" % (i, suffix))
for i in range(1, 3)
] + [ ] + [
("fedoratagger.tagger0%i" % i, "fedoratagger-tagger0%i.%s" % (i, suffix)) ("fedoratagger.tagger0%i" % i, "fedoratagger-tagger0%i.%s" % (i, suffix))
for i in range(1, 3) for i in range(1, 3)