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

Koschei: distinguish between Koji web and hub

Browse source
This commit is contained in:
Mikolaj Izdebski 2015-05-12 11:03:34 +00:00
parent a718dc951f
commit 942e1074ba
4 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/koschei
View file

@ -9,7 +9,8 @@ num_cpus: 4
koschei_pgsql_hostname: FIXME koschei_pgsql_hostname: FIXME
koschei_koji_hub: koji02.phx2.fedoraproject.org koschei_koji_hub: koji02.phx2.fedoraproject.org
koschei_kojipkgs: kojipkgs.fedoraproject.org koschei_kojipkgs: kojipkgs01.phx2.fedoraproject.org
koschei_koji_web: koji.fedoraproject.org
koschei_koji_tag: f23 koschei_koji_tag: f23
koschei_openid_provider: id.fedoraproject.org koschei_openid_provider: id.fedoraproject.org

1
inventory/group_vars/koschei-stg
View file

@ -10,6 +10,7 @@ num_cpus: 2
koschei_pgsql_hostname: db01.stg.phx2.fedoraproject.org koschei_pgsql_hostname: db01.stg.phx2.fedoraproject.org
koschei_koji_hub: koji01.stg.phx2.fedoraproject.org koschei_koji_hub: koji01.stg.phx2.fedoraproject.org
koschei_kojipkgs: koji01.stg.phx2.fedoraproject.org koschei_kojipkgs: koji01.stg.phx2.fedoraproject.org
koschei_koji_web: koji.stg.fedoraproject.org
koschei_koji_tag: f23 koschei_koji_tag: f23
koschei_openid_provider: id.stg.fedoraproject.org koschei_openid_provider: id.stg.fedoraproject.org

1
playbooks/hosts/koschei.cloud.fedoraproject.org.yml
View file

@ -28,6 +28,7 @@
- koscheiadmin_db_password: "{{ koschei_pgsql_password }}" - koscheiadmin_db_password: "{{ koschei_pgsql_password }}"
- koschei_koji_hub: koji.fedoraproject.org - koschei_koji_hub: koji.fedoraproject.org
- koschei_kojipkgs: kojipkgs.fedoraproject.org - koschei_kojipkgs: kojipkgs.fedoraproject.org
- koschei_koji_web: koji.fedoraproject.org
- koschei_koji_tag: f23 - koschei_koji_tag: f23
- koschei_openid_provider: id.fedoraproject.org - koschei_openid_provider: id.fedoraproject.org

2
roles/koschei/templates/config.cfg.j2
View file

@ -12,7 +12,7 @@ config = {
"koji_config": { "koji_config": {
"server": "http://{{ koschei_koji_hub }}/kojihub", "server": "http://{{ koschei_koji_hub }}/kojihub",
"topurl": "http://{{ koschei_kojipkgs }}", "topurl": "http://{{ koschei_kojipkgs }}",
"weburl": "http://{{ koschei_koji_hub }}/koji", "weburl": "http://{{ koschei_koji_web }}/koji",
"cert": "/etc/koschei/koschei.pem", "cert": "/etc/koschei/koschei.pem",
"ca": "/etc/koschei/fedora-ca.cert", "ca": "/etc/koschei/fedora-ca.cert",
"server_ca": "/etc/koschei/fedora-ca.cert", "server_ca": "/etc/koschei/fedora-ca.cert",