From 4dcfc3a81b7632b46390e3876d7fd85d8bd5f064 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Mon, 1 Feb 2021 15:05:33 -0500 Subject: [PATCH] users: Support defining different branch This will allow one to run the users role prior to a PR being merged. Signed-off-by: David Galloway --- roles/users/defaults/main.yml | 2 ++ roles/users/tasks/update_keys.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/users/defaults/main.yml b/roles/users/defaults/main.yml index d7e2f73..e7772c3 100644 --- a/roles/users/defaults/main.yml +++ b/roles/users/defaults/main.yml @@ -25,6 +25,8 @@ revoked_users: [] # A repo containing SSH pubkeys. Will be used for each user that has no key # specified. keys_repo: "https://github.com/ceph/keys" +# Branch of above repo to use +keys_branch: master # Where to clone keys_repo on the *local* disk keys_repo_path: "~/.cache/src/keys" diff --git a/roles/users/tasks/update_keys.yml b/roles/users/tasks/update_keys.yml index 8b16fd6..decb646 100644 --- a/roles/users/tasks/update_keys.yml +++ b/roles/users/tasks/update_keys.yml @@ -7,7 +7,7 @@ local_action: module: git repo: "{{ keys_repo }}" - version: master + version: "{{ keys_branch }}" # http://tracker.ceph.com/issues/16615 # depth: 1 force: yes -- 2.39.5