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

app0* stuff gone from fedmsg config, now.

Browse source
This commit is contained in:
Ralph Bean 2014-06-10 17:25:10 +00:00
parent 43b0cb1117
commit 46bd093586
2 changed files with 0 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,24 +1,11 @@
{% if env == 'staging' %} {% if env == 'staging' %}
suffix = "stg.phx2.fedoraproject.org" suffix = "stg.phx2.fedoraproject.org"
app_hosts = [
"app01.stg.phx2.fedoraproject.org",
"app02.stg.phx2.fedoraproject.org",
]
bodhi_hosts = [ bodhi_hosts = [
"bodhi01.stg.phx2.fedoraproject.org", "bodhi01.stg.phx2.fedoraproject.org",
] ]
topic_prefix = "org.fedoraproject.stg." topic_prefix = "org.fedoraproject.stg."
{% else %} {% else %}
suffix = "phx2.fedoraproject.org" suffix = "phx2.fedoraproject.org"
app_hosts = [
"app01.phx2.fedoraproject.org",
"app02.phx2.fedoraproject.org",
"app03.phx2.fedoraproject.org",
"app04.phx2.fedoraproject.org",
"app05.fedoraproject.org",
"app07.phx2.fedoraproject.org",
"app08.fedoraproject.org",
]
# TODO -- think about using the ansible group for this. # TODO -- think about using the ansible group for this.
bodhi_hosts = [ bodhi_hosts = [
"bodhi01.phx2.fedoraproject.org", "bodhi01.phx2.fedoraproject.org",

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

@ -1,22 +1,9 @@
{% if env == 'staging' %} {% if env == 'staging' %}
suffix = "stg.phx2.fedoraproject.org" suffix = "stg.phx2.fedoraproject.org"
app_hosts = [
"app01.stg.phx2.fedoraproject.org",
"app02.stg.phx2.fedoraproject.org",
]
topic_prefix = "org.fedoraproject.stg." topic_prefix = "org.fedoraproject.stg."
{% else %} {% else %}
suffix = "phx2.fedoraproject.org" suffix = "phx2.fedoraproject.org"
app_hosts = [
"app01.phx2.fedoraproject.org",
"app02.phx2.fedoraproject.org",
"app03.phx2.fedoraproject.org",
"app04.phx2.fedoraproject.org",
"app05.fedoraproject.org",
"app07.phx2.fedoraproject.org",
"app08.fedoraproject.org",
]
topic_prefix = "org.fedoraproject.prod." topic_prefix = "org.fedoraproject.prod."
{% endif %} {% endif %}
@ -37,13 +24,6 @@ config = dict(
crl_cache_expiry=86400, # Daily crl_cache_expiry=86400, # Daily
certnames=dict( certnames=dict(
[
("shell.app0%i" % i, "shell-%s" % app_hosts[i-1])
for i in range(1, len(app_hosts) + 1)
] + [
("bodhi.app0%i" % i, "bodhi-%s" % app_hosts[i-1])
for i in range(1, len(app_hosts) + 1)
] + [
("shell.pkgdb0%i" % i, "shell-pkgdb0%i.%s" % (i, suffix)) ("shell.pkgdb0%i" % i, "shell-pkgdb0%i.%s" % (i, suffix))
for i in range(1, 3) for i in range(1, 3)
] + [ ] + [