]>
git.apps.os.sepia.ceph.com Git - ceph-ansible.git/log
Guillaume Abrioux [Thu, 8 Dec 2016 15:58:22 +0000 (16:58 +0100)]
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>
Sébastien Han [Thu, 15 Dec 2016 12:43:33 +0000 (13:43 +0100)]
Merge pull request #1190 from zhsj/fix-rest-api
fix ceph-rest-api not using correct configure file
Shengjing Zhu [Thu, 15 Dec 2016 12:17:00 +0000 (20:17 +0800)]
fix ceph-rest-api not using correct configure file
Signed-off-by: Shengjing Zhu <zsj950618@gmail.com>
Sébastien Han [Thu, 15 Dec 2016 11:28:45 +0000 (12:28 +0100)]
Merge pull request #1186 from ceph/apt-pining
common: set apt pinning with Red Hat Ceph Storage
Sébastien Han [Wed, 14 Dec 2016 20:13:11 +0000 (21:13 +0100)]
Merge pull request #1187 from ceph/wait-for
common: show which file we are waiting for
Sébastien Han [Wed, 14 Dec 2016 20:08:18 +0000 (21:08 +0100)]
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>
Sébastien Han [Wed, 14 Dec 2016 18:03:04 +0000 (19:03 +0100)]
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>
Sébastien Han [Wed, 14 Dec 2016 17:15:02 +0000 (18:15 +0100)]
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>
Sébastien Han [Wed, 14 Dec 2016 17:40:04 +0000 (18:40 +0100)]
Merge pull request #1180 from ceph/ceph-installer-sync
changes needed for ceph-installer support
Andrew Schoen [Wed, 14 Dec 2016 15:13:55 +0000 (09:13 -0600)]
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>
Andrew Schoen [Mon, 12 Dec 2016 21:52:23 +0000 (15:52 -0600)]
adds the infrastructure-playbooks dir to the rpm packaging
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Sébastien Han [Wed, 14 Dec 2016 13:51:43 +0000 (14:51 +0100)]
Merge pull request #1184 from ceph/rhbz-
1403576
ceph-agent: do not check for subscription manager for agent install
Alfredo Deza [Wed, 14 Dec 2016 13:13:26 +0000 (08:13 -0500)]
ceph-agent: do not check for subscription manager for agent install
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: rhbz#
1403576
Sébastien Han [Wed, 14 Dec 2016 12:16:58 +0000 (13:16 +0100)]
Merge pull request #1183 from zhsj/fix-custom-repo
fix ceph_custom not usable
Sébastien Han [Wed, 14 Dec 2016 11:35:07 +0000 (12:35 +0100)]
Merge pull request #1181 from tynorth-cisco/key-issue
Change attribute call to .get call in ceph keys
Sébastien Han [Wed, 14 Dec 2016 11:25:31 +0000 (12:25 +0100)]
Merge pull request #1176 from jstuever/action_plugins
Adding symlink to action_plugins so this works in ansible tower
Shengjing Zhu [Wed, 14 Dec 2016 08:55:41 +0000 (16:55 +0800)]
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
tynorth-cisco [Wed, 14 Dec 2016 00:48:14 +0000 (16:48 -0800)]
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
Andrew Schoen [Tue, 13 Dec 2016 21:55:51 +0000 (15:55 -0600)]
Merge pull request #1158 from ceph/ceph-ansible-docker-vars
docker: consolidate ceph-ansible and ceph-docker varible
Andrew Schoen [Tue, 13 Dec 2016 21:48:36 +0000 (15:48 -0600)]
Merge pull request #1170 from font/docker_devices
Add devices variable for Vagrantfile docker case
Alfredo Deza [Mon, 12 Dec 2016 21:55:13 +0000 (16:55 -0500)]
Merge pull request #1174 from ceph/evelu-doc
README: Adding mailing list / irc / github entry points
Andrew Schoen [Mon, 12 Dec 2016 21:45:35 +0000 (15:45 -0600)]
Merge pull request #1177 from ceph/makefile-version-detection
Makefile: strip "v" from RPM versions, and improve version detection
Ken Dreyer [Mon, 12 Dec 2016 21:20:47 +0000 (14:20 -0700)]
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.
Ken Dreyer [Mon, 12 Dec 2016 21:17:52 +0000 (14:17 -0700)]
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.
Jeremiah Stuever [Mon, 12 Dec 2016 15:57:51 +0000 (10:57 -0500)]
Adding symlink to action_plugins so this works in ansible tower
Erwan Velu [Mon, 12 Dec 2016 15:39:22 +0000 (16:39 +0100)]
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.
Sébastien Han [Fri, 9 Dec 2016 13:51:35 +0000 (14:51 +0100)]
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>
Sébastien Han [Fri, 9 Dec 2016 13:45:05 +0000 (14:45 +0100)]
common: move mandatory variables to their respective roles
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Tue, 6 Dec 2016 16:28:30 +0000 (17:28 +0100)]
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>
Andrew Schoen [Fri, 9 Dec 2016 13:09:38 +0000 (07:09 -0600)]
Merge pull request #1169 from ceph/shaman-support
Shaman support for `ceph_dev`
Sébastien Han [Fri, 9 Dec 2016 09:47:46 +0000 (10:47 +0100)]
Merge pull request #1165 from opsta/master
Improve script to install Ceph AIO without Vagrant
Jirayut 'Dear' Nimsaeng [Fri, 9 Dec 2016 09:42:28 +0000 (16:42 +0700)]
Remove osd pool default min size variable
Ivan Font [Fri, 9 Dec 2016 07:14:18 +0000 (23:14 -0800)]
Add devices variable for Vagrantfile docker case
Alfredo Deza [Thu, 8 Dec 2016 20:16:10 +0000 (15:16 -0500)]
ceph-common: fetch ceph_dev repo contents for CentOS from shaman
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 8 Dec 2016 20:14:48 +0000 (15:14 -0500)]
ceph-common: remove ceph_dev* vars that are no longer needed
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 8 Dec 2016 20:09:37 +0000 (15:09 -0500)]
group_vars: remove ceph_dev* vars that are no longer needed
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Thu, 8 Dec 2016 19:22:29 +0000 (14:22 -0500)]
ceph-common: fetch ceph_dev repo contents for debian from shaman
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Sébastien Han [Thu, 8 Dec 2016 20:15:13 +0000 (21:15 +0100)]
Merge pull request #1168 from Logan2211/fix-mons-check
Fix the mons running check to use group name var
Logan V [Thu, 8 Dec 2016 19:16:02 +0000 (13:16 -0600)]
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.
Sébastien Han [Thu, 8 Dec 2016 17:55:21 +0000 (18:55 +0100)]
Merge pull request #1157 from ceph/ceph-fsid
common: do not regenerate a cluster fsid if cluster exits
Andrew Schoen [Thu, 8 Dec 2016 16:28:28 +0000 (10:28 -0600)]
Merge pull request #1162 from ceph/timeout-collect-keys
mon: remove collect keys
Jirayut Nimsaeng [Thu, 8 Dec 2016 15:22:37 +0000 (22:22 +0700)]
Use ceph_conf_overrides to config default pool size
Alfredo Deza [Thu, 8 Dec 2016 15:22:24 +0000 (10:22 -0500)]
Merge pull request #1150 from ceph/testinfra
tests: use testinfra to verify cluster setup in our CI tests
Jirayut Nimsaeng [Thu, 8 Dec 2016 15:22:01 +0000 (22:22 +0700)]
Remove variables that can be override with ceph_conf_overrides
Jirayut Nimsaeng [Thu, 8 Dec 2016 14:18:47 +0000 (21:18 +0700)]
- Remove check host key
- Remove sudo when install Ansible
Jirayut Nimsaeng [Thu, 8 Dec 2016 12:26:08 +0000 (19:26 +0700)]
- Add option to configure default pool size
- Add option not to install MDS and RGW
- Improve ssh_setup to check if file and key already exist
- Improve populate_vars for safety rerun for idempotent
- Change path of inventory file to where ansible run. So this won't pollute the system
Jirayut Nimsaeng [Thu, 8 Dec 2016 12:25:15 +0000 (19:25 +0700)]
Add mon_pg_warn_max_per_osd, osd_pool_default_size and osd_pool_default_min_size variables
Sébastien Han [Thu, 8 Dec 2016 10:24:11 +0000 (11:24 +0100)]
Merge pull request #1164 from guits/master
git: update gitignore
Guillaume Abrioux [Thu, 8 Dec 2016 07:17:35 +0000 (08:17 +0100)]
git: update gitignore
* ignore `*.retry` files in general
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Andrew Schoen [Thu, 8 Dec 2016 01:24:40 +0000 (19:24 -0600)]
tests: adds an osds parameter to the node fixture
The osds are named differently for systemd in containerized deployments
so this new parameter is used to make that change transparent in the
tests.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Thu, 8 Dec 2016 01:19:43 +0000 (19:19 -0600)]
tests: mark tests with no_docker that fail on containerized deployments
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Thu, 8 Dec 2016 01:17:09 +0000 (19:17 -0600)]
tests: adds a docker property to the node fixture
This is used to skip tests that will not work with containerized
deployment or atomic hosts.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Thu, 8 Dec 2016 01:15:29 +0000 (19:15 -0600)]
tests: adds a docker: true var to the docker_cluster scenario
This lets the CI tests know that this scenario is using docker and
should skip certain tests.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Wed, 7 Dec 2016 23:02:02 +0000 (17:02 -0600)]
docker: fix ceph.conf generation for multiple mons
Before this patch only the address for the first mon would show
in the ceph.conf even if there were multiple mons in the inventory.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Wed, 7 Dec 2016 20:31:31 +0000 (14:31 -0600)]
tests: account for multiple osd hosts when testing if all are up and in
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 22:52:02 +0000 (16:52 -0600)]
tests: ensure all osds are listening on the cluster network
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 22:46:42 +0000 (16:46 -0600)]
tests: test that all osds are listening on the public network
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Wed, 7 Dec 2016 16:32:00 +0000 (10:32 -0600)]
tests: add num_devices to node fixture
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Sébastien Han [Wed, 7 Dec 2016 13:36:24 +0000 (14:36 +0100)]
mon: remove collect keys
Once the monitor process starts it will also trigger `ceph-create-keys`
which will collect the admin key and bootstrap keys. We used to force
this command because we were having issues on some distros like centos
7.0 and 7.1 not triggering this. This is fixed on centos 7.2 and not an
issue on ubuntu 14.04 or 16.04 so we can remove this task. If the
monitor hangs or fails to start the playbook will fail right after at
the "wait for client.admin key exists" task after 300sec.
Closes: #1161
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Tue, 6 Dec 2016 14:59:49 +0000 (15:59 +0100)]
common: do not regenerate a cluster fsid 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 fsid doesn't exist so we
are creating a new one. Later the ceph.conf gets updated with a wrong
fsid which causes problems for clients and ceph processes.
Closes: #1148
Signed-off-by: Sébastien Han <seb@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 20:24:36 +0000 (14:24 -0600)]
tests: adds a comment to the setup.yml playbook for clarification
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 20:23:12 +0000 (14:23 -0600)]
tests: skip installing net-tools on atomic hosts
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 20:13:50 +0000 (14:13 -0600)]
tests: dmcrypt_journal_collocation should run journal collocation tests
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 20:07:40 +0000 (14:07 -0600)]
tests: use cluster_name in tests when needed
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 19:39:08 +0000 (13:39 -0600)]
tests: use node["conf_path"] instead of hardcoding the path in tests
This also accounts for the cluster having a custom cluster name
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 19:32:28 +0000 (13:32 -0600)]
tests: add cluster_name and conf_path to the node fixture
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 16:55:20 +0000 (10:55 -0600)]
tests: include the number of mons as a attribute on node
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 16:50:54 +0000 (10:50 -0600)]
tests: update skip messages in conftest.py
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 15:58:01 +0000 (09:58 -0600)]
tests: rename vars to ansible_vars in conftest.node
This is to avoid redefining the builtin vars()
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Dec 2016 15:54:50 +0000 (09:54 -0600)]
tests: rename CephNode to node and add a bit of documentation
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 22:27:19 +0000 (16:27 -0600)]
tests: with testinfra we don't need scenario.py files anymore
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 22:23:15 +0000 (16:23 -0600)]
tests: tests for collocated journals
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 22:21:52 +0000 (16:21 -0600)]
tests: add a journal_collocation tag to collocated journal tests
The test will be skipped if journal_collocation is not True in the
group_vars for the scenario.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 22:21:10 +0000 (16:21 -0600)]
tests: ensure ceph-mon is installed on mons
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 21:54:11 +0000 (15:54 -0600)]
tests: make sure all osds are mounted
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 21:05:23 +0000 (15:05 -0600)]
tests: adds some basic tests for OSD nodes
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 21:03:44 +0000 (15:03 -0600)]
testing: CephNode should return osd_ids
This is an empty list on anything but an OSD node. These ids will be
used for further OSD testing.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 18:07:53 +0000 (12:07 -0600)]
tests: remove test files that are not used anymore
These tests have been replaced by the ones in test_install.py
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 18:06:46 +0000 (12:06 -0600)]
tests: test ceph.conf using testinfra modules
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 16:07:04 +0000 (10:07 -0600)]
tests: ensure tests marked with 'all' run on every node
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Mon, 5 Dec 2016 15:47:33 +0000 (09:47 -0600)]
tests: the CephNode fixture should provide the cluster subnet
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Sun, 4 Dec 2016 02:10:35 +0000 (20:10 -0600)]
tests: tests mon services to ensure they are running correctly
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Sun, 4 Dec 2016 02:09:37 +0000 (20:09 -0600)]
tests: run testinfra with --sudo
It needs this so that the modules can use sudo
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Sun, 4 Dec 2016 02:08:53 +0000 (20:08 -0600)]
tests: run the setup.yml playbook with tox
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Sun, 4 Dec 2016 02:02:05 +0000 (20:02 -0600)]
tests: include a playbook to install net-tools for socket checks
This playbook could be used in the future to install anything else we
need on these nodes for testing purposes.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Sun, 4 Dec 2016 02:01:30 +0000 (20:01 -0600)]
tests: return address and ansible vars from CephNode
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Sat, 3 Dec 2016 14:10:54 +0000 (08:10 -0600)]
tests: port tests/functional/test_install.py to use testinfra fixtures
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Sat, 3 Dec 2016 14:07:09 +0000 (08:07 -0600)]
tests: change conftest.py to support dynamic markers and test selection
This applies correct markers to tests depending on their file path.
Tests that live at the root of tests/functional/tests will be given a
marker of 'all' and apply to any type of ceph node.
Tests that live in tests/functional/tests/mon will get the
'mons' marker and will only run for nodes in the 'mons' group.
Tests that live in tests/functional/tests/osd will get the 'osds'
marker and will only run for nodes in the 'osds' group.
All tests must use the CephNode fixture for this to work and be
parameterized by testinfra.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Sat, 3 Dec 2016 14:06:20 +0000 (08:06 -0600)]
tests: use testinfra in tox.ini instead of pytest directly
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Sébastien Han [Tue, 6 Dec 2016 15:04:52 +0000 (16:04 +0100)]
Merge pull request #1155 from ceph/take-over-fix
take-over: use more precise ceph.conf detection
Sébastien Han [Tue, 6 Dec 2016 14:02:49 +0000 (15:02 +0100)]
take-over: use more precise ceph.conf detection
Prior to this patch we were just looking for any *.conf file which
sometimes could results in multiple matches. The new command looks for a
.conf file that must contain [global] and 'fsid' patterns. This will
definitely get us the ceph.conf file. We can not directly use ceph.conf
because of a different cluster name.
Signed-off-by: Sébastien Han <seb@redhat.com>
Sébastien Han [Tue, 6 Dec 2016 09:19:23 +0000 (10:19 +0100)]
Merge pull request #1152 from ceph/gitignore-travis
Gitignore travis
Sébastien Han [Thu, 1 Dec 2016 15:34:03 +0000 (16:34 +0100)]
git: update gitignore
* ignore yml files in general
* refactor based on commit
f8e043b6ea5ac4e886532d4f2f675c507b44b955 that
changed directory layouts
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
ec5c6f5da566611c4e0b88f925cbd26dc90368d6 )
Sébastien Han [Thu, 1 Dec 2016 15:28:56 +0000 (16:28 +0100)]
ci: remove travis
since now we have the ceph CI taking care of the syntax check we don't
need travis anymore. Thanks Travis you served us well!
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit
9fbe65cb72e01c586af3a27788c8e3e9549e0abf )
Sébastien Han [Mon, 5 Dec 2016 09:14:58 +0000 (10:14 +0100)]
Merge pull request #1144 from yanshanchen/fix-shrink-osd-regex
the pattern in regex_replace is not right when the pid of osd is bigger than 9999
chenyanshan [Mon, 5 Dec 2016 05:40:38 +0000 (13:40 +0800)]
this patch fix the regex pattern in infrastructure-playbooks/shrink-osd.yml when the osd's pid num is bigger than 9999
Signed-off-by: chenyanshan <yanshanchen@139.com>
Alfredo Deza [Fri, 2 Dec 2016 15:27:05 +0000 (10:27 -0500)]
Merge pull request #1141 from ceph/more-mons
centos7_cluster and xenial_cluster scenarios should use 3 mons
Andrew Schoen [Thu, 1 Dec 2016 23:27:09 +0000 (17:27 -0600)]
tests: make centos7_cluster use three mons
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Thu, 1 Dec 2016 22:59:27 +0000 (16:59 -0600)]
tests: rename the directory for centos7_cluster
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Thu, 1 Dec 2016 22:56:06 +0000 (16:56 -0600)]
tests: removes unused xenial_conf_tests and xenial_mon_osd scenarios
Signed-off-by: Andrew Schoen <aschoen@redhat.com>