From 734e9939a4cda5b93d588f279e6131024781fb67 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Feb 13 2018 11:12:31 +0000 Subject: Install Copr-dev credentials for Koschei --- diff --git a/inventory/group_vars/koschei-backend b/inventory/group_vars/koschei-backend index 914da08..be170dd 100644 --- a/inventory/group_vars/koschei-backend +++ b/inventory/group_vars/koschei-backend @@ -12,6 +12,9 @@ koschei_pgsql_hostname: db01.phx2.fedoraproject.org koschei_koji_hub: koji.fedoraproject.org koschei_kojipkgs: kojipkgs.fedoraproject.org koschei_koji_web: koji.fedoraproject.org +koschei_copr_url: http://copr-fe.cloud.fedoraproject.org +koschei_copr_login: NOT-USED-YET +koschei_copr_token: NOT-USED-YET host_group: koschei-backend diff --git a/inventory/group_vars/koschei-backend-stg b/inventory/group_vars/koschei-backend-stg index 7afe9c3..b12523e 100644 --- a/inventory/group_vars/koschei-backend-stg +++ b/inventory/group_vars/koschei-backend-stg @@ -12,6 +12,9 @@ koschei_pgsql_hostname: pgbdr.stg.phx2.fedoraproject.org koschei_koji_hub: koji.stg.fedoraproject.org koschei_kojipkgs: koji.stg.fedoraproject.org koschei_koji_web: koji.stg.fedoraproject.org +koschei_copr_url: http://copr-fe-dev.cloud.fedoraproject.org +koschei_copr_login: "{{ koschei_copr_login_stg }}" +koschei_copr_token: "{{ koschei_copr_token_stg }}" tcp_ports: [ @@ -55,6 +58,7 @@ csi_relationship: | - fedmsg hub - bastion (for mail relay) - memcached01 + - Copr development instance koschei_backend_services: - koschei-polling diff --git a/roles/koschei/backend/tasks/main.yml b/roles/koschei/backend/tasks/main.yml index 3ebf99e..39d9e3c 100644 --- a/roles/koschei/backend/tasks/main.yml +++ b/roles/koschei/backend/tasks/main.yml @@ -74,6 +74,7 @@ with_items: - config-admin.cfg - config-backend.cfg + - copr-config notify: - restart koschei backend services tags: @@ -89,8 +90,6 @@ - config - fedmsgdconfig -# TODO install copr config, /etc/koschei/copr-config - - name: install koji client config file template: > src="koji.conf.j2" diff --git a/roles/koschei/backend/templates/copr-config.j2 b/roles/koschei/backend/templates/copr-config.j2 new file mode 100644 index 0000000..f5489af --- /dev/null +++ b/roles/koschei/backend/templates/copr-config.j2 @@ -0,0 +1,5 @@ +[copr-cli] +login = {{ koschei_copr_login }} +username = koschei +token = {{ koschei_copr_token }} +copr_url = {{ koschei_copr_url }}