Commit Graph

2121 Commits (stable-2.1)
 

Author SHA1 Message Date
Sébastien Han ff8c86757d ceph-common: remove ganesha old ppa
The ppa does not exist anymore and makes any installation with
stable-2.1 fail.

Closes: https://github.com/ceph/ceph-ansible/issues/2286
Signed-off-by: Sébastien Han <seb@redhat.com>
2018-01-02 16:20:46 +01:00
Sébastien Han 87b7ab500c Merge pull request #1436 from mcv21/backport_osd_fragments_fix
Backport osd fragments fix
2017-05-18 16:16:23 +02:00
Matthew Vernon 7736e0ad60 Only include cluster.conf and osd.conf when building ceph.conf
This is the same fix as bc846b7da6
applied to the other part of the code-base that builds ceph.conf (I'd
missed that 349b9ab3e7 had duplicated
this code).

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
2017-04-11 15:18:47 +01:00
Matthew Vernon b7e1324575 Only assemble {{ cluster }}.conf and osd.conf
Ansible's assemble module by default will put all files in the src
directory together into dest. We only want to put {{ cluster }}.conf
and osd.conf together, not anything that might have found its way into
/etc/ceph/ceph.d (e.g. files left by the sysadmin taking backups
before an ansible run). So specify a regexp that matches only those
two files.

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
2017-04-11 15:18:47 +01:00
Christian Zunker a388fa5a7b Make ceph-common aware of osd config fragments
This removes the implicit order requirement when using OSD fragments.
When you use OSD fragments and ceph-osd role is not the last one,
the fragments get removed from ceph.conf by ceph-common.

It is not nice to have this code at two locations, but this is
necessary to prevent problems, when ceph-osd is the last role as
ceph-common gets executed before ceph-osd.

This could be prevented when ceph-common would be explicitly called
at the end of the playbook.

This is a backport of commit 349b9ab3e7
onto Stable-2.1. That commit was by Christian Zunker
<christian.zunker@codecentric.de>

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
2017-04-11 15:18:47 +01:00
Alfredo Deza e887552a67 Merge pull request #1433 from ceph/docs-missing-static
Docs missing static
2017-04-11 09:48:23 -04:00
Alfredo Deza 66a9817e56 docs: force an empty _templates dir so sphinx is happy
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-11 09:08:45 -04:00
Alfredo Deza aacbbf0efe docs: force an empty _static dir so sphinx is happy
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-04-11 09:08:08 -04:00
Andrew Schoen cc52415230 Merge pull request #1424 from ceph/stable-docs
backport docs for stable-2.1
2017-04-11 07:48:53 -05:00
Alfredo Deza 5b7e47cf9d docs: add missing sections/refs in scenarios.rst
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit e8ae5c6aaf)
2017-04-10 08:42:25 -04:00
Alfredo Deza 4b63ca5638 docs: include testing conventions and testinfra in layout.rst
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit c768f34219)
2017-04-10 08:42:25 -04:00
Alfredo Deza 2fa7f7f35e docs: fix typo in testing/index.rst
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 7eb26d1b00)
2017-04-10 08:42:25 -04:00
Alfredo Deza 654ba82478 docs: include the tests and tox files in the glossary
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 3cde692482)
2017-04-10 08:42:25 -04:00
Alfredo Deza f1338026a5 docs: create a tests doc file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f895b4c376)
2017-04-10 08:42:25 -04:00
Alfredo Deza f94ead2fe3 docs: create a separate tox doc file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit cb504f6d88)
2017-04-10 08:42:25 -04:00
Alfredo Deza 1c3ce00a2c docs: use glossary for the :doc: directive
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 41815f6b53)
2017-04-10 08:42:25 -04:00
Alfredo Deza 78567b1612 docs: add the testing glossary in the toctree
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit ae6349fd21)
2017-04-10 08:42:25 -04:00
Alfredo Deza f044630060 docs: normalize the glossary vs. contents files
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a5b2ede0ff)
2017-04-10 08:42:25 -04:00
Alfredo Deza 20b9b02fa9 docs: create a separate docs tox.ini
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 14d46cb2be)
2017-04-10 08:42:25 -04:00
Alfredo Deza 19e7f55cca docs: initial structure for tests docs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 1f3d78e6c2)
2017-04-10 08:42:25 -04:00
Alfredo Deza ba315926f4 docs create a separate glossary file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 0d0e427a6c)
2017-04-10 08:42:24 -04:00
Alfredo Deza 7dd090ef04 docs: the master doc is the glossary file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 20210c35de)
2017-04-10 08:42:24 -04:00
Alfredo Deza 9844dce09c docs: ignore build contents from git
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 1ad331b026)
2017-04-10 08:42:24 -04:00
Alfredo Deza 2e5dcb1f36 docs: initial take on doc structure
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 1a181fff4c)
2017-04-10 08:42:24 -04:00
Sébastien Han fd93045173 Merge pull request #1372 from mcv21/backport-1224
Backport fix for issue 1224 to stable-2.1 branch
2017-03-16 12:20:27 +01:00
Matthew Vernon 60bf6b86c0 Update sample group_vars files
The previous cherry-pick changed the defaults for the ceph-osd role; this commit is the result of thereafter running generate_group_vars_sample.sh

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
2017-03-16 11:06:51 +00:00
Daniel Marks 5478be8a2e Set empty list as default for osd_directories
As described in issue #1224 leaving this variable undefined may
cause a problem during execution of the ceph-osd role.
2017-03-16 10:48:57 +00:00
Andrew Schoen 0edd89af3a Merge pull request #1312 from ceph/backport-1311
backport: "purge-cluster: also purge dmcrypt dedicated journals #1311"
2017-02-15 13:16:33 -06:00
Andrew Schoen b6b0e6b5e4 purge-cluster: also purge dmcrypt dedicated journals
See: https://bugzilla.redhat.com/show_bug.cgi?id=1414647

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 22f52a9dc6)
2017-02-15 11:57:56 -06:00
Sébastien Han deb4730a9d Merge pull request #1308 from ceph/backport-1306
backport: "purge-cluster: remove calamari-server package #1306"
2017-02-15 10:52:56 +01:00
Andrew Schoen fea8145d37 purge-cluster: remove calamari-server package
See: https://bugzilla.redhat.com/show_bug.cgi?id=1422134

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

Resolves rhbz#1422134

(cherry picked from commit c5f561a4e9)
2017-02-14 12:30:36 -06:00
Andrew Schoen 0a10e9d452 Merge pull request #1293 from ceph/backport-1284
Backport: "purge-cluster: do not use ceph-detect-init #1284"
2017-02-08 09:32:00 -06:00
Andrew Schoen 3a451c2efe Merge pull request #1292 from ceph/backport-1281
Backport: 'purge: ability to purge client role #1281'
2017-02-08 08:49:00 -06:00
Andrew Schoen 3e6b8bef13 purge-cluster: set a default value for fetch_directory if not defined
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 865b4500dc)
2017-02-08 08:47:18 -06:00
Andrew Schoen 0b77c16e37 purge-cluster: remove all include tasks
Including variables from role defaults or files in a group_vars
directory relative to the playbook is a bad practice. We don't want to
do this because including these defaults at the task level overrides
values that would be set in a group_vars directory relative to the
inventory file, which is the correct usage if you wish to override
those default values.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit adf6aee643)
2017-02-08 08:47:08 -06:00
Andrew Schoen cb3523f68b purge-cluster: do not use ceph-detect-init
We can not always ensure that ceph-detect-init will be
present on the system.

See: https://bugzilla.redhat.com/show_bug.cgi?id=1418980

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 0476b24af1)
2017-02-08 08:46:55 -06:00
Sébastien Han 32964bbf34 purge-docker: force image deletion
even if non-runnin containers are using this image as a reference.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c34d0a9d28)
2017-02-08 06:29:24 -06:00
Sébastien Han e539610285 purge: ability to purge client role
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 72cd9199ac)
2017-02-08 06:29:10 -06:00
Andrew Schoen 23e5bfa1a6 Merge pull request #1288 from ceph/backport-1285
backport: "ceph-common: set ms bind ipv6 = true in ceph.conf when using ipv6 #1285"
2017-02-08 06:28:19 -06:00
Andrew Schoen 2507202213 ceph-common: set ms bind ipv6 = true in ceph.conf when using ipv6
This fixes an issue with parsing the ceph.conf file when ip_version is set to
ipv6.

See: https://bugzilla.redhat.com/show_bug.cgi?id=1419814

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 9580fd974a)
2017-02-07 15:20:27 -06:00
Sébastien Han 0b8421ab03 Merge pull request #1280 from ceph/stable-2.1-revert
Revert to v2.1.6 (631e6d0fbb)
2017-02-06 10:59:32 +01:00
Andrew Schoen 834ddabf56 Revert to v2.1.6 (631e6d0fbb) 2017-02-03 12:07:55 -06:00
Sébastien Han fe324025aa Merge pull request #1279 from ceph/backport-1274
backport 1274: common: ability to disable handler osd health check
2017-02-03 17:30:22 +01:00
Sébastien Han 65a983911d common: ability to disable handler osd health check
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-02-03 16:41:15 +01:00
Sébastien Han d7e326b86f Merge pull request #1278 from ceph/backport-1256
Backport: Using ini_file with ansible_hostname to ensure each INI block gets th…
2017-02-03 16:28:29 +01:00
Chris Wells aac89e548d Using ini_file with ansible_hostname to ensure each INI block gets the rgw_zone setting in a multi-RGW setup. Also, ansible_hostname better matches what ceph-common does for the actual hostname (ansible_host != ansible_hostname under all conditions). 2017-02-03 16:22:47 +01:00
Sébastien Han 57e6edff98 docker: use systemd to manage container
Since we now only support systemd has an init system we can finally
treat containers as processes using systemd and this for all the
distros.

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-02-03 16:16:20 +01:00
Sébastien Han 88a2b2de8c docker: fail if systemd is not present
Since we treat containers as services using systemd, systemd is an
absolute requirement.

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-02-03 16:16:20 +01:00
Sébastien Han 0d4cd0db7e docker: fix mkdir path for all the distros
On ubntu systems mkdir is in /bin where on atomic it is /usr/bin/.
We use the shell built-in function "command" to find its right location.

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-02-03 16:16:20 +01:00
Kyle Squizzato d593ac23d2 README: Don't use underscores for opts in ceph_conf_overrides
Adding underscores in the ceph_conf_overrides variable can result in incorrect
config options appearing.  A note has been added to clarify that using
underscores here can cause this behavior and recommending not to do it.

See: https://github.com/ceph/ceph-ansible/issues/1262

Signed-off-by: Kyle Squizzato <ksquizz@gmail.com>
2017-02-03 16:16:20 +01:00