diff options
| author | Mikolaj Izdebski <mizdebsk@redhat.com> | 2015-08-26 16:38:54 +0000 |
|---|---|---|
| committer | Mikolaj Izdebski <mizdebsk@redhat.com> | 2015-08-26 16:38:54 +0000 |
| commit | f495e0a533dac992c7729d7cfa779672d34ad634 (patch) | |
| tree | 2067c1d986060ecec3163f67d1ef878f4a07d441 /roles/fedmsg/base/templates | |
| parent | 204cc4981d1114ecd3b29833b6039af2c32a7d8c (diff) | |
| download | ansible-f495e0a533dac992c7729d7cfa779672d34ad634.tar.gz ansible-f495e0a533dac992c7729d7cfa779672d34ad634.tar.xz ansible-f495e0a533dac992c7729d7cfa779672d34ad634.zip | |
Adjust jenkins fedmsg config
Diffstat (limited to 'roles/fedmsg/base/templates')
| -rw-r--r-- | roles/fedmsg/base/templates/relay.py.j2 | 2 | ||||
| -rw-r--r-- | roles/fedmsg/base/templates/ssl.py.j2 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/fedmsg/base/templates/relay.py.j2 b/roles/fedmsg/base/templates/relay.py.j2 index 1671da662..13862d7b4 100644 --- a/roles/fedmsg/base/templates/relay.py.j2 +++ b/roles/fedmsg/base/templates/relay.py.j2 @@ -24,7 +24,7 @@ config = dict( # It is also used by the mediawiki php plugin which, due to the oddities of # php, can't maintain a single passive-bind endpoint of it's own. relay_inbound=[ - {% if 'persistent-cloud' in group_names or 'jenkins-cloud' in group_names %} + {% if 'persistent-cloud' in group_names or 'jenkins-master' in group_names %} # Stuff from the cloud has to go through our external proxy first.. #"tcp://hub.fedoraproject.org:9941", diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index 7ea15f5a3..42bd30ad7 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -48,8 +48,8 @@ config = dict( ("copr.copr-be", "copr-copr-be.cloud.fedoraproject.org"), # Jenkins, also being a cloud node, is weird. Like copr. - ("shell.jenkins-master-unknown", "shell-jenkins.cloud.fedoraproject.org"), - ("jenkins.jenkins-master-unknown", "jenkins-jenkins.cloud.fedoraproject.org"), + ("shell.jenkins-master-unknown", "shell-jenkins.fedorainfracloud.org"), + ("jenkins.jenkins-master-unknown", "jenkins-jenkins.fedorainfracloud.org"), ]), ) |