Commit Graph

25 Commits (ff135a50243f35e2345a73de5fb25338dea3d74b)

Author SHA1 Message Date
Sébastien Han b233de51ba contrib: use prune to fetch
Sometimes git keeps data from remotes that are not up-to-date, i.e:
remote branches.
Using `--prune` will delete non-existing remote branches from git's caches.

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-01-19 13:42:48 +01:00
Sébastien Han 93157773b5 contrib: push all new stable branches to the galaxy
Prior to this patch we were only pushing 'master' and 'ansible-1.9'
branches. Each new release also introduces a new branch so we want to
push it as well.

Yes the 'grep' is a bit ugly, feel free to come up with something nicer :)

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-01-19 13:42:48 +01:00
Andrew Schoen 0b23a5c624 adds ceph-docker-common to the script that updates ansible galaxy
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-01-18 11:00:51 -06:00
Sébastien Han 3bdae23e42 contrib: untrap before calling popd
we need to untrap before calling popd if the script is being run from a
directory different than the git repo. popd will go back to the previous
directory and trap will execute reset_hard_origin function on EXIT.
If we are not in the righ directory, this will fail.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 23:22:49 +01:00
Sébastien Han 34a59695f8 contrib: don't fetch tags since we push force
reverting 4be9c52baf

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 19:07:52 +01:00
Sébastien Han eb22286452 contrib: use push force because of the CI
If we don't force push we won't be able to push new content from
jenkins.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 18:54:14 +01:00
Sébastien Han 4be9c52baf contrib: do a fetch all so we don't push force
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 16:46:30 +01:00
Sébastien Han 0530ff86f9 contrib: It doesn't make sense to pull all tags
On certain git versions running: git pull origin --tags ends up with the
following error: It doesn't make sense to pull all tags; you probably
meant: git fetch --tags

So removing the --tags since later in the execution we do a git fetch
--tags

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 15:12:40 +01:00
Sébastien Han e9de87d66b contrib: add a goto basedir function
This way if the script is not executed from the git directory we jump
into it, do our stuff and then go back to the dir where the user was.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-11-28 14:27:28 +01:00
Sébastien Han 25b04feff8 Merge pull request #1113 from guits/master
All `include_vars` need to have `*.yml`, `*.yaml` or `*.json` extension.
2016-11-24 15:19:29 +01:00
Sébastien Han 90a28b8b41 contrib: add a new script to update remote repos
This script allows us to split ceph-ansible role directory into
repositories that can be pushed.
This script is an enhanced version of splitup.yml that was using git
subtree. I haven't found any straighforward way to push tag using git
subtree where git filter-branch seems easier and more practical.

Now we can not only push commits from master but also all the relative
tags. It is nice for projects that want to consume our roles from the
Ansible Galaxy, pointing to a specific tags looking for a particular
release.

For backward compatobility, I pushed a branch called
"master-history-bkp" on all the github.com/ceph/ansbible-ceph-*
repositories. So current projects using a SHA to retrieve the roles
won't be impacted by this change.

At the time of the commit, running this script took  104.60s to
complete.

Signed-off-by: Sébastien Han <seb@redhat.com>
Co-Authored-By: Erwan Velu <erwan@redhat.com>
Co-Authored-By: Logan Vig <logan2211@gmail.com>
2016-11-23 17:15:34 +01:00
Sébastien Han a5e00fea86 contrib: add a new script to update remote repos
This script allows us to split ceph-ansible role directory into
repositories that can be pushed.
This script is an enhanced version of splitup.yml that was using git
subtree. I haven't found any straighforward way to push tag using git
subtree where git filter-branch seems easier and more practical.

Now we can not only push commits from master but also all the relative
tags. It is nice for projects that want to consume our roles from the
Ansible Galaxy, pointing to a specific tags looking for a particular
release.

For backward compatobility, I pushed a branch called
"master-history-bkp" on all the github.com/ceph/ansbible-ceph-*
repositories. So current projects using a SHA to retrieve the roles
won't be impacted by this change.

At the time of the commit, running this script took  104.60s to
complete.

Signed-off-by: Sébastien Han <seb@redhat.com>
Co-Authored-By: Erwan Velu <erwan@redhat.com>
Co-Authored-By: Logan Vig <logan2211@gmail.com>
2016-11-23 14:51:39 +01:00
Sébastien Han a2fcd222d2 moving to ansible v2.2 compatibility
Signed-off-by: Sébastien Han <seb@redhat.com>
Co-Authored-By: Julien Francoz julien@francoz.net
2016-11-04 10:09:38 +01:00
Sébastien Han 40df8fb814 ceph-client: introduce new client role
By default, this roles will create a ceph config file and get the admin
key. You can optionnally add other users, keys and pools for your tests.

Closes: #769

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-05-11 14:36:35 +02:00
Li Peng aaeadcab12 cleanup: fix typos
Signed-off-by: Li Peng <lip@dtdream.com>
2016-05-09 15:12:01 +08:00
Sébastien Han c78f5d7340 contrib: update with ceph-rbd-mirror
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-04-08 12:30:14 +02:00
Sébastien Han 1ebb4de7f3 rollback previous change for ceph-common change
changing the name of the directory causes issues with git subtree which
will create new commits. Creating a symlink for vagrant to be happy.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-03-02 18:44:36 +01:00
Sébastien Han 872a17d1db contrib: fix ceph-common role name
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-03-02 17:29:57 +01:00
Sébastien Han 077d9e0f71 contrib: add ceph-fetch-keys
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-18 18:07:43 +01:00
Sébastien Han 3c074fba9b contrib: add the ceph-agent
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-15 17:11:03 +01:00
Sébastien Han 64b32020e9 Necessary change to work on ansible v2
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-01-25 11:21:30 +01:00
Michael Sambol e6f22b948c Failed_when instead of ignore_errors
Changed ignore_errors to failed_when so the output doesn't show in
red.
2015-07-29 13:35:46 -05:00
leseb 1f5cf4f8f3 Fix the branch update
Signed-off-by: leseb <seb@redhat.com>
2015-07-24 19:16:32 +02:00
leseb 08add29d92 Modify the repo to host reoles on the galaxy
Signed-off-by: leseb <seb@redhat.com>
2015-07-24 18:14:59 +02:00
Markus Hubig f27e8e0846 Adds ansible script to split this repo into roles.
Use it like this, to split and update:

ansible-playbook -i dummy-ansible-hosts contrib/splitup.yml \
  --tags split --extra-vars github=mhubig/ansible

ansible-playbook -i dummy-ansible-hosts contrib/splitup.yml \
  --tags update --extra-vars github=mhubig/ansible
2015-02-23 18:25:37 +01:00