From: David Galloway <dgallowa@redhat.com>
Date: Mon, 1 Feb 2021 20:05:33 +0000 (-0500)
Subject: users: Support defining different branch
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F605%2Fhead;p=ceph-cm-ansible.git

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 <dgallowa@redhat.com>
---

diff --git a/roles/users/defaults/main.yml b/roles/users/defaults/main.yml
index d7e2f735..e7772c30 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 8b16fd6c..decb6464 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