move tasks into their directory

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ansible/roles/ceph-deploy-release/clear_version.yml b/ansible/roles/ceph-deploy-release/clear_version.yml
deleted file mode 100644 (file)
index 7199829..0000000
--- a/ansible/roles/ceph-deploy-release/clear_version.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-
-- name: undo last commit from failed release
-  command: git reset --soft HEAD~1 chdir=ceph-deploy
-  when: (clean and version in last_commit.stdout)
-
-- name: git checkout {{ branch }} branch
-  command: git checkout {{ branch }} chdir=ceph-deploy
-
-- name: remove local tag
-  command: git tag -d v{{ version }} chdir=ceph-deploy
-  ignore_errors: yes
-
-- name: remove remote tag
-  command: git push jenkins :refs/tags/v{{ version }} chdir=ceph-deploy
-  ignore_errors: yes
-
-- name: force push changes to jenkins git repo
-  command: git push -f jenkins {{ branch }} chdir=ceph-deploy

diff --git a/ansible/roles/ceph-deploy-release/main.yml b/ansible/roles/ceph-deploy-release/main.yml
deleted file mode 100644 (file)
index 9b20ea6..0000000
--- a/ansible/roles/ceph-deploy-release/main.yml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-
-- name: check if ceph-deploy repo exists
-  stat: path='./ceph-deploy'
-  register: 'cdep_repo'
-
-- name: clone the ceph-deploy repository
-  git: repo=git@github.com:ceph/ceph-deploy dest=ceph-deploy
-  when: cdep_repo.stat.exists is defined and cdep_repo.stat.exists == false
-
-- name: rename origin to jenkins
-  command: git remote rename origin jenkins chdir=ceph-deploy
-  ignore_errors: yes
-
-- name: fetch the latest from remote
-  command: git fetch jenkins chdir=ceph-deploy
-
-- name: ensure local repo is in sync with remote
-  command: git reset --hard jenkins/{{ branch }} chdir=ceph-deploy
-
-- name: check if we are re-pushing the release commit
-  command: git log -1 --pretty=%B chdir=ceph-deploy
-  register: 'last_commit'
-
-  # we probably messed up the previous commit+tag, so we chose to use 'clean'
-  # that will rollback that commit, delete the local and remote tag, and force
-  # push the new changes
-- include: clear_version.yml
-  when: (clean and version in last_commit.stdout)
-
-  # if the last commit wasn't one that we already did, then go ahead and make
-  # the changes + tag for the release. Otherwise, just skip because it was
-  # already done for this release
-- include: release.yml
-  when: (version not in last_commit.stdout)

diff --git a/ansible/roles/ceph-deploy-release/release.yml b/ansible/roles/ceph-deploy-release/release.yml
deleted file mode 100644 (file)
index e728f3f..0000000
--- a/ansible/roles/ceph-deploy-release/release.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-
-- name: fetch the latest from remote
-  command: git fetch jenkins chdir=ceph-deploy
-
-- name: ensure local repo is in sync with remote
-  command: git reset --hard jenkins/{{ branch }} chdir=ceph-deploy
-
-- name: git checkout {{ branch }} branch
-  command: git checkout {{ branch }} chdir=ceph-deploy
-
-- name: set the debian version
-  command: dch -v {{ version }} -D stable "New upstream release" chdir=ceph-deploy
-  environment:
-    DEBEMAIL: "{{ debemail }}"
-    DEBFULLNAME: "{{ debfullname }}"
-
-- name: set the version in the spec file
-  lineinfile: dest=ceph-deploy/ceph-deploy.spec
-              regexp="Version{{':'}}\s+"
-              line="Version{{':'}}       {{ version }}"
-              state=present
-
-- name: commit the version changes
-  command: git commit -a -m "{{ version }}" chdir=ceph-deploy
-
-  # from script: /srv/ceph-build/tag_release.sh
-  # Contents of tag_release.sh
-  # FIXME: this used to be a signed tag:
-  # command: git tag -s "v{{ version }}"  -u 17ED316D -m "v{{ version }}" chdir=ceph-deploy
-- name: tag and commit the version
-  command: git tag "v{{ version }}" -m "v{{ version }}" chdir=ceph-deploy
-  environment:
-    GNUPGHOME: ~/build/gnupg.ceph-release
-    DEBEMAIL: "{{ debemail }}"
-    DEBFULLNAME: "{{ debfullname }}"
-
-- name: push changes to jenkins git repo
-  command: git push jenkins {{ branch }} chdir=ceph-deploy
-
-  # FIXME: this used to be set when signing the tag:
-  #   environment:
-  #       GNUPGHOME: ~/build/gnupg.ceph-release
-- name: push the newly created tag
-  command: git push jenkins v{{ version }} chdir=ceph-deploy

diff --git a/ansible/roles/ceph-deploy-release/tasks/clear_version.yml b/ansible/roles/ceph-deploy-release/tasks/clear_version.yml
new file mode 100644 (file)
index 0000000..7199829
--- /dev/null
+++ b/ansible/roles/ceph-deploy-release/tasks/clear_version.yml
@@ -0,0 +1,19 @@
+---
+
+- name: undo last commit from failed release
+  command: git reset --soft HEAD~1 chdir=ceph-deploy
+  when: (clean and version in last_commit.stdout)
+
+- name: git checkout {{ branch }} branch
+  command: git checkout {{ branch }} chdir=ceph-deploy
+
+- name: remove local tag
+  command: git tag -d v{{ version }} chdir=ceph-deploy
+  ignore_errors: yes
+
+- name: remove remote tag
+  command: git push jenkins :refs/tags/v{{ version }} chdir=ceph-deploy
+  ignore_errors: yes
+
+- name: force push changes to jenkins git repo
+  command: git push -f jenkins {{ branch }} chdir=ceph-deploy

diff --git a/ansible/roles/ceph-deploy-release/tasks/main.yml b/ansible/roles/ceph-deploy-release/tasks/main.yml
new file mode 100644 (file)
index 0000000..9b20ea6
--- /dev/null
+++ b/ansible/roles/ceph-deploy-release/tasks/main.yml
@@ -0,0 +1,35 @@
+---
+
+- name: check if ceph-deploy repo exists
+  stat: path='./ceph-deploy'
+  register: 'cdep_repo'
+
+- name: clone the ceph-deploy repository
+  git: repo=git@github.com:ceph/ceph-deploy dest=ceph-deploy
+  when: cdep_repo.stat.exists is defined and cdep_repo.stat.exists == false
+
+- name: rename origin to jenkins
+  command: git remote rename origin jenkins chdir=ceph-deploy
+  ignore_errors: yes
+
+- name: fetch the latest from remote
+  command: git fetch jenkins chdir=ceph-deploy
+
+- name: ensure local repo is in sync with remote
+  command: git reset --hard jenkins/{{ branch }} chdir=ceph-deploy
+
+- name: check if we are re-pushing the release commit
+  command: git log -1 --pretty=%B chdir=ceph-deploy
+  register: 'last_commit'
+
+  # we probably messed up the previous commit+tag, so we chose to use 'clean'
+  # that will rollback that commit, delete the local and remote tag, and force
+  # push the new changes
+- include: clear_version.yml
+  when: (clean and version in last_commit.stdout)
+
+  # if the last commit wasn't one that we already did, then go ahead and make
+  # the changes + tag for the release. Otherwise, just skip because it was
+  # already done for this release
+- include: release.yml
+  when: (version not in last_commit.stdout)

diff --git a/ansible/roles/ceph-deploy-release/tasks/release.yml b/ansible/roles/ceph-deploy-release/tasks/release.yml
new file mode 100644 (file)
index 0000000..e728f3f
--- /dev/null
+++ b/ansible/roles/ceph-deploy-release/tasks/release.yml
@@ -0,0 +1,45 @@
+---
+
+- name: fetch the latest from remote
+  command: git fetch jenkins chdir=ceph-deploy
+
+- name: ensure local repo is in sync with remote
+  command: git reset --hard jenkins/{{ branch }} chdir=ceph-deploy
+
+- name: git checkout {{ branch }} branch
+  command: git checkout {{ branch }} chdir=ceph-deploy
+
+- name: set the debian version
+  command: dch -v {{ version }} -D stable "New upstream release" chdir=ceph-deploy
+  environment:
+    DEBEMAIL: "{{ debemail }}"
+    DEBFULLNAME: "{{ debfullname }}"
+
+- name: set the version in the spec file
+  lineinfile: dest=ceph-deploy/ceph-deploy.spec
+              regexp="Version{{':'}}\s+"
+              line="Version{{':'}}       {{ version }}"
+              state=present
+
+- name: commit the version changes
+  command: git commit -a -m "{{ version }}" chdir=ceph-deploy
+
+  # from script: /srv/ceph-build/tag_release.sh
+  # Contents of tag_release.sh
+  # FIXME: this used to be a signed tag:
+  # command: git tag -s "v{{ version }}"  -u 17ED316D -m "v{{ version }}" chdir=ceph-deploy
+- name: tag and commit the version
+  command: git tag "v{{ version }}" -m "v{{ version }}" chdir=ceph-deploy
+  environment:
+    GNUPGHOME: ~/build/gnupg.ceph-release
+    DEBEMAIL: "{{ debemail }}"
+    DEBFULLNAME: "{{ debfullname }}"
+
+- name: push changes to jenkins git repo
+  command: git push jenkins {{ branch }} chdir=ceph-deploy
+
+  # FIXME: this used to be set when signing the tag:
+  #   environment:
+  #       GNUPGHOME: ~/build/gnupg.ceph-release
+- name: push the newly created tag
+  command: git push jenkins v{{ version }} chdir=ceph-deploy