Commit Graph

2348 Commits (14d46cb2be8edb93f2764ca18e35e414cf4e07ec)
 

Author SHA1 Message Date
Sébastien Han 03f7de68a9 Merge pull request #1167 from guits/ceph-fsid
common: do not regenerate initial mon keyring if cluster exists
2016-12-15 15:16:40 +01:00
Sébastien Han 7538898174 Merge pull request #1191 from ceph/docker-osd-check
osd: docker change required variables for check
2016-12-15 15:16:15 +01:00
Shengjing Zhu a1b00e96db enable prepare osd with partition devices in raw_multi_journal
Address #895

Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
2016-12-15 22:03:38 +08:00
Shengjing Zhu 2dc2e1d48c infrastructure playbook: add make osd partition
Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
2016-12-15 22:03:38 +08:00
Sébastien Han 81baa6bb73 osd: docker change required variables for check
when running a containerized deployment, some variable are not
applicable thus should not be checked.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-15 14:50:29 +01:00
Guillaume Abrioux 471be5e629 common: do not regenerate initial mon keyring if cluster exists
This commit solves the situation where you lost your fetch directory and
you are running ansible against an existing cluster. Since no fetch
directory is present the file containing the initial mon keyring
doesn't exist so we are generating a new one.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2016-12-15 14:39:56 +01:00
Sébastien Han f868fd26b5 Merge pull request #1190 from zhsj/fix-rest-api
fix ceph-rest-api not using correct configure file
2016-12-15 13:43:33 +01:00
Shengjing Zhu c50b5867a6 fix ceph-rest-api not using correct configure file
Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
2016-12-15 20:23:36 +08:00
Sébastien Han 245a556c5e Merge pull request #1186 from ceph/apt-pining
common: set apt pinning with Red Hat Ceph Storage
2016-12-15 12:28:45 +01:00
Sébastien Han 13fd78bd20 Merge pull request #1187 from ceph/wait-for
common: show which file we are waiting for
2016-12-14 21:13:11 +01:00
Sébastien Han f6736e5420 common: show which file we are waiting for
We can now see the name of the file we are waiting for, depending on the
cluster name this will change.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-14 21:08:18 +01:00
Sébastien Han 3776c23b9a common: remove uncessary conditions and spell red hat entirely
We do not need to run another condition for 'ceph_rhcs' since the
include we came from already has it, so we are already inside this
condition.
We also spell red hat entirely instead of rh and we remove capital
letters.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-14 19:03:04 +01:00
Sébastien Han 13a72fd24b common: set apt pinning with Red Hat Ceph Storage
When `ceph_stable_rh_storage` is True, every cluster node should have a
`/etc/apt/preferences.d/rhcs.pref` file with the following contents:

```
Explanation: Prefer Red Hat packages
Package: *
Pin: release o=/Red Hat/
Pin-Priority: 999
```

ceph-deploy already did this when used with ice-setup, and we need to do
the same thing with the ceph-ansible stack.

Closes: #1182 and https://bugzilla.redhat.com/show_bug.cgi?id=1404515

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-14 19:01:54 +01:00
Sébastien Han 7e74fab370 Merge pull request #1180 from ceph/ceph-installer-sync
changes needed for ceph-installer support
2016-12-14 18:40:04 +01:00
Andrew Schoen 3b014df6c0 ensure site.yml.sample always gathers facts and installs python2
Then avoids an issue where if you're using tags to run the playbook then
no facts are gathered, resulting in subsequent tasks failing that depend
on them.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-14 09:13:55 -06:00
Andrew Schoen 547b84d535 adds the infrastructure-playbooks dir to the rpm packaging
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-12-14 09:12:46 -06:00
Sébastien Han 1b5afef9ed Merge pull request #1184 from ceph/rhbz-1403576
ceph-agent: do not check for subscription manager for agent install
2016-12-14 14:51:43 +01:00
Alfredo Deza 640442bee6 ceph-agent: do not check for subscription manager for agent install
Signed-off-by: Alfredo Deza <adeza@redhat.com>

Resolves: rhbz#1403576
2016-12-14 08:13:26 -05:00
Sébastien Han 2f6d603738 Merge pull request #1183 from zhsj/fix-custom-repo
fix ceph_custom not usable
2016-12-14 13:16:58 +01:00
Sébastien Han e7f0dfb777 Merge pull request #1181 from tynorth-cisco/key-issue
Change attribute call to .get call in ceph keys
2016-12-14 12:35:07 +01:00
Sébastien Han 68edc8e4f3 Merge pull request #1176 from jstuever/action_plugins
Adding symlink to action_plugins so this works in ansible tower
2016-12-14 12:25:31 +01:00
Shengjing Zhu 9051f8d5b4 fix ceph_custom not usable
Only when ceph_origin == "upstream", install_on_redhat.yml will include
redhat_ceph_repository.yml, same as debian.

In redhat_ceph_repository.yml, ceph_custom_repo will be added.

But in check_mandatory_vars.yml, ceph_origin=="upstream" can't be combined
with ceph_custom
2016-12-14 16:55:41 +08:00
tynorth-cisco 3c6e156d08 Change attribute call to .get call in ceph keys
If previous check was not run, .stdout_lines is not a valid key on the dictionary.
To get around this, use .get("stdout_lines") instead.

Also add in a default empty list
2016-12-13 16:48:14 -08:00
Andrew Schoen b9d296e926 Merge pull request #1158 from ceph/ceph-ansible-docker-vars
docker: consolidate ceph-ansible and ceph-docker varible
2016-12-13 15:55:51 -06:00
Andrew Schoen e7847cd59a Merge pull request #1170 from font/docker_devices
Add devices variable for Vagrantfile docker case
2016-12-13 15:48:36 -06:00
Alfredo Deza 2b06cafc5c Merge pull request #1174 from ceph/evelu-doc
README: Adding mailing list / irc / github entry points
2016-12-12 16:55:13 -05:00
Andrew Schoen 297d9ff96f Merge pull request #1177 from ceph/makefile-version-detection
Makefile: strip "v" from RPM versions, and improve version detection
2016-12-12 15:45:35 -06:00
Ken Dreyer 20e7bad984 Makefile: improve version detection
Prior to this change, if there was a stray tag in the repository that
did not start with a "v", the Makefile would still try to use that tag
as a version tag when constructing the RPMs.

Only use the tags that start with "v", in this case.
2016-12-12 14:22:29 -07:00
Ken Dreyer cda441595b Makefile: strip "v" from RPM versions
Prior to this change, all RPMs would have a Version field that started
with "v", for example "ceph-ansible-v2.0.0-163.g2c98b1d.el7"

Strip the "v" out in these cases, so that the version is simply a
number.
2016-12-12 14:22:08 -07:00
Jeremiah Stuever 52ad169db6 Adding symlink to action_plugins so this works in ansible tower 2016-12-12 10:57:51 -05:00
Erwan Velu b40e698174 README: Adding mailing list / irc / github entry points
For new comers, it's easier to find irc & the mailing list if we
mention them here.
2016-12-12 16:39:22 +01:00
Casey Bodley acaf01ac17 purge-cluster: add new version of libcephfs2
the libcephfs version was bumped to 2, so we need to check for that as
well when we're removing all ceph packages

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-12-09 16:54:06 -05:00
Casey Bodley 0ebb728d7d ceph-common: remove libcephfs1 from debian_ceph_packages
in hammer, ceph-common depended on libcephfs (indirectly, via
python-cephfs). this is no longer the case in jewel or later, so it can
be removed from debian_ceph_packages

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-12-09 16:49:20 -05:00
Sébastien Han 189f4fee47 common: do not run tasks in main.yml, use include
For readibility and clarity we do not run any tasks directly in the
main.yml file. This file should only contain include, which helps us
later to apply conditionnals if we want to.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-09 16:00:46 +01:00
Sébastien Han 1de8176bf4 common: move mandatory variables to their respective roles
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-09 14:45:05 +01:00
Sébastien Han 75cb749570 docker: consolidate ceph-ansible and ceph-docker varible
This commit re-uses some of the existing ceph-ansible variables for a
containirzed deployment. There is no reasons why we should add new
variables for the containerized deployment.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-12-09 14:39:05 +01:00
Andrew Schoen 2c98b1d70f Merge pull request #1169 from ceph/shaman-support
Shaman support for `ceph_dev`
2016-12-09 07:09:38 -06:00
Sébastien Han 9ea6517d69 Merge pull request #1165 from opsta/master
Improve script to install Ceph AIO without Vagrant
2016-12-09 10:47:46 +01:00
Jirayut 'Dear' Nimsaeng 3ab48e1398 Remove osd pool default min size variable 2016-12-09 16:42:28 +07:00
Ivan Font be8ed2f59a Add devices variable for Vagrantfile docker case 2016-12-08 23:14:18 -08:00
Alfredo Deza deb96d7b04 ceph-common: fetch ceph_dev repo contents for CentOS from shaman
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-12-08 16:55:15 -05:00
Alfredo Deza 4e2948bce3 ceph-common: remove ceph_dev* vars that are no longer needed
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-12-08 16:55:15 -05:00
Alfredo Deza 096b3b0375 group_vars: remove ceph_dev* vars that are no longer needed
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-12-08 16:55:15 -05:00
Alfredo Deza f741ee7402 ceph-common: fetch ceph_dev repo contents for debian from shaman
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-12-08 16:55:14 -05:00
Sébastien Han f7322baf54 Merge pull request #1168 from Logan2211/fix-mons-check
Fix the mons running check to use group name var
2016-12-08 21:15:13 +01:00
Logan V 034fc1a791 Fix the mons running check to use group name var
mon_group_name variable can be used to override mons group, but
this task assumes the group is always 'mons'. So we need to use
the var to find the group name instead.
2016-12-08 13:16:02 -06:00
Sébastien Han 7b0602c224 Merge pull request #1157 from ceph/ceph-fsid
common: do not regenerate a cluster fsid if cluster exits
2016-12-08 18:55:21 +01:00
Andrew Schoen 7812e0b32e Merge pull request #1162 from ceph/timeout-collect-keys
mon: remove collect keys
2016-12-08 10:28:28 -06:00
Jirayut Nimsaeng 5bc8eb2d56 Use ceph_conf_overrides to config default pool size 2016-12-08 22:22:37 +07:00
Alfredo Deza 33331cb962 Merge pull request #1150 from ceph/testinfra
tests: use testinfra to verify cluster setup in our CI tests
2016-12-08 10:22:24 -05:00