ceph-tag: Fix paths and order

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/ansible/roles/ceph-release/tasks/push.yml b/ansible/roles/ceph-release/tasks/push.yml
index 023fc13f4f070185f4109b48854128b0272d714f..136fe09fc63e10ec1525b992da53034f62150fee 100644 (file)
--- a/ansible/roles/ceph-release/tasks/push.yml
+++ b/ansible/roles/ceph-release/tasks/push.yml
@@ -3,23 +3,23 @@
 # We want to make sure packages get pulled, signed, and pushed before publicly
 # pushing the security fix. Pushing tags will be done manually by a human.
 
+- name: clone the ceph repository
+  git:
+    repo: git@github.com:ceph/ceph.git
+    dest: ceph
+    remote: upstream
+    accept_hostkey: yes
+    recursive: no
+
 # the colon appended to the v{{ version }} tag removes the previous tag
 # https://git-scm.com/docs/git-push#Documentation/git-push.txt--d
 - name: clear the previous remote tag
-  command: git push origin :v{{ version }}
+  command: git push upstream :v{{ version }}
   args:
     chdir: ceph
   ignore_errors: yes
   when: tag|bool is true
 
-- name: clone the ceph repository
-  git:
-    repo: https://github.com/ceph/ceph
-    dest: ceph
-    remote: upstream
-    accept_hostkey: yes
-    recursive: no
-
 - name: add releases repo
   command: git remote add -f releases git@github.com:ceph/ceph-releases.git
   args:
@@ -42,7 +42,7 @@
     chdir: ceph
 
 - name: "git checkout {{ branch }}"
-  command: git checkout {{ branch }}
+  command: git checkout upstream/{{ branch }}
   args:
     chdir: ceph