From: Sébastien Han <seb@redhat.com>
Date: Wed, 2 Mar 2016 16:29:57 +0000 (+0100)
Subject: contrib: fix ceph-common role name
X-Git-Tag: v1.0.1~4^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=872a17d1dba7d158671a7e1716fc98e91b8aacb5;p=ceph-ansible.git

contrib: fix ceph-common role name

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/contrib/splitup.yml b/contrib/splitup.yml
index f4c55f0ec..04d609c90 100644
--- a/contrib/splitup.yml
+++ b/contrib/splitup.yml
@@ -8,6 +8,9 @@
 #
 # ansible-playbook -i dummy-ansible-hosts contrib/splitup.yml \
 #   --tags update --extra-vars github=mhubig/ansible
+#
+# To point to a specific role, ie: ceph-mon just run with "-e roles=ceph-mon"
+#
 
 - name: This recipe split the roles into repos and keeps them updated.
   hosts: localhost
@@ -17,7 +20,6 @@
   vars:
     github: ceph/ansible
     roles:
-      - ceph-common
       - ceph-mon
       - ceph-osd
       - ceph-mds
@@ -40,14 +42,18 @@
       command: git subtree split --prefix=roles/{{ item }} -b {{ item }} --squash
       args:
         chdir: "{{ basedir }}"
-      with_items: roles
+      with_items:
+        - roles
+        - ceph.ceph-common
 
     - name: adds remote github repos for the splits
       tags: split
       command: git remote add {{ item }} git@github.com:{{ github }}-{{ item }}.git
       args:
         chdir: "{{ basedir }}"
-      with_items: roles
+      with_items:
+        - roles
+        - ceph-common
 
     - name: adds upstream remote
       tags: update
@@ -64,3 +70,9 @@
       args:
         chdir: "{{ basedir }}"
       with_items: roles
+
+    - name: update the split repos from master (ceph-common)
+      tags: update
+      shell: git push ceph-common $(git subtree split --prefix roles/ceph.ceph-common master):master --force
+      args:
+        chdir: "{{ basedir }}"