Revert "ceph-release: Fix checkout process for HOTFIX"

This reverts commit 25f83fd65c5ac936b5dc618ed6c553c9a2307529.

diff --git a/ansible/roles/ceph-release/tasks/create.yml b/ansible/roles/ceph-release/tasks/create.yml
index 0215a38ccb8c7697f65aeca95051a36a74579f51..db46e07d35e946823674da45e71a4e8be79f159d 100644 (file)
--- a/ansible/roles/ceph-release/tasks/create.yml
+++ b/ansible/roles/ceph-release/tasks/create.yml
@@ -37,7 +37,7 @@
   args:
     chdir: ceph
   when:
-    - "release != 'SECURITY'"
+    - "release == 'STABLE' or release == 'RELEASE_CANDIDATE'"
     - tag|bool is true
 
 - name: "git checkout previously existing tag for re-build"
@@ -45,10 +45,18 @@
   args:
     chdir: ceph
   when:
-    - "release != 'SECURITY'"
+    - "release == 'STABLE' or release == 'RELEASE_CANDIDATE'"
     - tag|bool is false
     - throwaway|bool is false
 
+# HOTFIX
+# This assumes hotfix has already been pushed to {{ branch }}-release branch on github
+- name: "git checkout {{ branch }}-release for HOTFIX release"
+  command: git checkout {{ branch }}-release
+  args:
+    chdir: ceph
+  when: "release == 'HOTFIX'"
+
 # SECURITY
 - name: "git checkout security {{ branch }}-release branch"
   command: git checkout -f -B {{ branch }}-release security/{{ branch }}-release