From 942e1074ba437f34b4f79f7935a5a72db97da86a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 12 May 2015 11:03:34 +0000 Subject: [PATCH] Koschei: distinguish between Koji web and hub --- inventory/group_vars/koschei | 3 ++- inventory/group_vars/koschei-stg | 1 + playbooks/hosts/koschei.cloud.fedoraproject.org.yml | 1 + roles/koschei/templates/config.cfg.j2 | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/koschei b/inventory/group_vars/koschei index 1cf5ec0ec0..e62470c9ba 100644 --- a/inventory/group_vars/koschei +++ b/inventory/group_vars/koschei @@ -9,7 +9,8 @@ num_cpus: 4 koschei_pgsql_hostname: FIXME 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_openid_provider: id.fedoraproject.org diff --git a/inventory/group_vars/koschei-stg b/inventory/group_vars/koschei-stg index dc70aecd87..2f6a14f9f8 100644 --- a/inventory/group_vars/koschei-stg +++ b/inventory/group_vars/koschei-stg @@ -10,6 +10,7 @@ num_cpus: 2 koschei_pgsql_hostname: db01.stg.phx2.fedoraproject.org koschei_koji_hub: koji01.stg.phx2.fedoraproject.org koschei_kojipkgs: koji01.stg.phx2.fedoraproject.org +koschei_koji_web: koji.stg.fedoraproject.org koschei_koji_tag: f23 koschei_openid_provider: id.stg.fedoraproject.org diff --git a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml index b2e686328d..ed9b2934a2 100644 --- a/playbooks/hosts/koschei.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/koschei.cloud.fedoraproject.org.yml @@ -28,6 +28,7 @@ - koscheiadmin_db_password: "{{ koschei_pgsql_password }}" - koschei_koji_hub: koji.fedoraproject.org - koschei_kojipkgs: kojipkgs.fedoraproject.org + - koschei_koji_web: koji.fedoraproject.org - koschei_koji_tag: f23 - koschei_openid_provider: id.fedoraproject.org diff --git a/roles/koschei/templates/config.cfg.j2 b/roles/koschei/templates/config.cfg.j2 index 0f1cd2875d..ae54852451 100644 --- a/roles/koschei/templates/config.cfg.j2 +++ b/roles/koschei/templates/config.cfg.j2 @@ -12,7 +12,7 @@ config = { "koji_config": { "server": "http://{{ koschei_koji_hub }}/kojihub", "topurl": "http://{{ koschei_kojipkgs }}", - "weburl": "http://{{ koschei_koji_hub }}/koji", + "weburl": "http://{{ koschei_koji_web }}/koji", "cert": "/etc/koschei/koschei.pem", "ca": "/etc/koschei/fedora-ca.cert", "server_ca": "/etc/koschei/fedora-ca.cert",