From: Kyr Shatskyy Date: Fri, 15 Mar 2019 00:17:10 +0000 (+0100) Subject: teuthology: add defaults for ceph_git_base_url X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F460%2Fhead;p=ceph-cm-ansible.git teuthology: add defaults for ceph_git_base_url Signed-off-by: Kyr Shatskyy --- diff --git a/roles/teuthology/defaults/main.yml b/roles/teuthology/defaults/main.yml index 4b62c341..1204f5bc 100644 --- a/roles/teuthology/defaults/main.yml +++ b/roles/teuthology/defaults/main.yml @@ -11,7 +11,7 @@ teuthology_users: teuthology_repo: https://github.com/ceph/teuthology.git teuthology_branch: "master" teuthology_yaml_extra: "" - +teuthology_ceph_git_base_url: "git://git.ceph.com/" archive_base: "/home/{{ teuthology_execution_user }}/archive" remote_crontab_url: "https://raw.githubusercontent.com/ceph/ceph/master/qa/crontab/teuthology-cronjobs" diff --git a/roles/teuthology/templates/teuthology.yaml b/roles/teuthology/templates/teuthology.yaml index c1055f33..8fedf206 100644 --- a/roles/teuthology/templates/teuthology.yaml +++ b/roles/teuthology/templates/teuthology.yaml @@ -11,6 +11,6 @@ max_job_time: {{ teuthology_max_job_time|default(129600) }} # Not yet configurable via ansible archive_server: http://{{ inventory_hostname }}/ archive_base: {{ archive_base }} -ceph_git_base_url: git://git.ceph.com/ +ceph_git_base_url: {{ teuthology_ceph_git_base_url }} queue_host: localhost queue_port: 11300