]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
8 years agoceph-common: fixes bug related to monitor_interface set in inventory
Andrew Schoen [Thu, 6 Jul 2017 18:33:49 +0000 (13:33 -0500)]
ceph-common: fixes bug related to monitor_interface set in inventory

The ceph.conf template needs to look for the value of monitor_interface
in hostvars[host] because there might be different values set per host.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1656 from ceph/luminous-testing-6
Guits [Wed, 12 Jul 2017 14:31:28 +0000 (16:31 +0200)]
Merge pull request #1656 from ceph/luminous-testing-6

Luminous testing

8 years agoTests: Add an mgr node do dmcrypt-dedicated-journal 1656/head
Guillaume Abrioux [Tue, 11 Jul 2017 19:20:43 +0000 (21:20 +0200)]
Tests: Add an mgr node do dmcrypt-dedicated-journal

Add an mgr node to `dmcrypt-dedicated-journal` scenario testing.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoUpdate: Avoid screen scraping in rolling update
Guillaume Abrioux [Tue, 11 Jul 2017 13:36:01 +0000 (15:36 +0200)]
Update: Avoid screen scraping in rolling update

since luminous has revamped the `ceph -s` output, we need to avoid screen
scraping.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoDocker: Fix bug "waiting for /dev/XXX to show up"
Guillaume Abrioux [Sun, 9 Jul 2017 09:40:40 +0000 (11:40 +0200)]
Docker: Fix bug "waiting for /dev/XXX to show up"

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoTests: rename tests directories
Guillaume Abrioux [Fri, 7 Jul 2017 16:30:06 +0000 (18:30 +0200)]
Tests: rename tests directories

Since we are hitting this bug :

https://bugzilla.redhat.com/show_bug.cgi?id=1324587
eg:

`failed: internal error: Monitor path /var/lib/libvirt/qemu/domain-bs-docker-cl
uster-dmcrypt-journal-collocation_mon0_1499294943_ba9faf7bf296533177f6/monitor.
sock too big for destination`

and we can't upgrade libvirt in our CI for some reason

we need to get the directories name shorter in order to workaround this
issue

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoOsd: Fix bug 'uniq' command not found
Guillaume Abrioux [Fri, 7 Jul 2017 15:46:31 +0000 (17:46 +0200)]
Osd: Fix bug 'uniq' command not found

Due to a breaking space introduced by d2320e412e the command here is
broken.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoTests: Add bluestore scenarios
Guillaume Abrioux [Wed, 12 Jul 2017 13:02:32 +0000 (15:02 +0200)]
Tests: Add bluestore scenarios

Since we started testing against Luminous, we need to add more scenarios
testing.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoOsd: Force filestore and bluestore usage
Guillaume Abrioux [Wed, 5 Jul 2017 22:01:31 +0000 (00:01 +0200)]
Osd: Force filestore and bluestore usage

In Luminous, ceph-disk defaults to bluestore so all our scenarios are
using bluestore, we need to force testing both.

Signed-off-by: Sébastien Han <seb@redhat.com>
Co-Authored-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agotests: allow bluestore devices
Sébastien Han [Wed, 5 Jul 2017 08:45:25 +0000 (10:45 +0200)]
tests: allow bluestore devices

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agotests: fix block.db partition size
Sébastien Han [Wed, 5 Jul 2017 08:38:22 +0000 (10:38 +0200)]
tests: fix block.db partition size

Our devices in the CI are 12GB, there are not big enough for the default
size. Reducing its size.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agotesting: add luminous factor for testing
Alfredo Deza [Mon, 15 May 2017 16:46:49 +0000 (12:46 -0400)]
testing: add luminous factor for testing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Co-Authored-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1664 from ceph/client-role
Guits [Fri, 7 Jul 2017 15:13:55 +0000 (17:13 +0200)]
Merge pull request #1664 from ceph/client-role

site: docker add client role

8 years agosite: docker add client role 1664/head
Sébastien Han [Fri, 7 Jul 2017 15:01:58 +0000 (17:01 +0200)]
site: docker add client role

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1663 from ceph/add_docker_custom_admin_secret
Sébastien Han [Fri, 7 Jul 2017 14:46:03 +0000 (16:46 +0200)]
Merge pull request #1663 from ceph/add_docker_custom_admin_secret

Doc: containerized deploy with custom admin secret

8 years agoDoc: containerized deploy with custom admin secret 1663/head
Guillaume Abrioux [Fri, 7 Jul 2017 13:48:53 +0000 (15:48 +0200)]
Doc: containerized deploy with custom admin secret

In addition to ceph/ceph-docker@69d9aa6, this explains how to deploy a
containerized cluster with a custom admin secret.
Basically, just need to pass the `admin_secret` defined in your
`group_vars/all.yml` to the `ceph_mon_docker_extra_env` variable.

Eg:

`ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }}
-e MON_NAME={{ monitor_name }} -e ADMIN_SECRET={{ admin_secret }}`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1644 from fullerdj/wip-djf-check-devices
Sébastien Han [Fri, 7 Jul 2017 13:48:39 +0000 (15:48 +0200)]
Merge pull request #1644 from fullerdj/wip-djf-check-devices

osd: validate devices variable input

8 years agoMerge pull request #1662 from fullerdj/wip-djf-install-rsync
Sébastien Han [Fri, 7 Jul 2017 13:46:22 +0000 (15:46 +0200)]
Merge pull request #1662 from fullerdj/wip-djf-install-rsync

common: ensure rsync is installed for local install

8 years agoosd: validate devices variable input 1644/head
Douglas Fuller [Mon, 3 Jul 2017 15:10:16 +0000 (15:10 +0000)]
osd: validate devices variable input

Fail with a sane message if the devices or raw_journal_devices variables
are strings instead of lists during manual device assignment.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
8 years agocommon: ensure rsync is installed for local install 1662/head
Douglas Fuller [Thu, 6 Jul 2017 17:29:43 +0000 (17:29 +0000)]
common: ensure rsync is installed for local install

rsync is required by the ansible synchronize package. Ensure
it is installed when local installation is selected.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
8 years agoMerge pull request #1627 from ceph/ceph-osd-prepare-script
Sébastien Han [Thu, 6 Jul 2017 14:08:59 +0000 (16:08 +0200)]
Merge pull request #1627 from ceph/ceph-osd-prepare-script

osd: docker, refactor ceph-osd-run.sh.j2

8 years agoosd: docker, refactor ceph-osd-run.sh.j2 1627/head
Sébastien Han [Mon, 26 Jun 2017 13:40:30 +0000 (15:40 +0200)]
osd: docker, refactor ceph-osd-run.sh.j2

Easier to read and enhance.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1657 from ceph/fix_tests_docker-dmcrypt-journal-colloc
Sébastien Han [Thu, 6 Jul 2017 11:49:31 +0000 (13:49 +0200)]
Merge pull request #1657 from ceph/fix_tests_docker-dmcrypt-journal-colloc

Tests: fix scenario for docker-cluster-dmcrypt-journal-collocation

8 years agoTests: fix scenario for docker-cluster-dmcrypt-journal-collocation 1657/head
Guillaume Abrioux [Thu, 6 Jul 2017 06:10:50 +0000 (08:10 +0200)]
Tests: fix scenario for docker-cluster-dmcrypt-journal-collocation

The scenario set in `group_vars/all` for
docker-cluster-dmcrypt-journal-collocation is not the correct one.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1649 from ceph/fix_1630
Sébastien Han [Wed, 5 Jul 2017 13:42:47 +0000 (15:42 +0200)]
Merge pull request #1649 from ceph/fix_1630

Mon: Allow to deploy with custom admin secret

8 years agoMon: Allow to deploy with custom admin secret 1649/head
Guillaume Abrioux [Wed, 5 Jul 2017 09:07:00 +0000 (11:07 +0200)]
Mon: Allow to deploy with custom admin secret

Add a new parameter `admin_secret` that allow to deploy a ceph cluster
with a custom admin secret.

Fix: #1630

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agotest: fix docker dmcrypt collocated scenario
Sébastien Han [Fri, 30 Jun 2017 12:52:04 +0000 (14:52 +0200)]
test: fix docker dmcrypt collocated scenario

We were setting journal_collocation and used raw_journal_devices which
is definitely wrong. We should just stick with devices.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1632 from ceph/bluestore-redundant-options
Sébastien Han [Tue, 4 Jul 2017 17:33:54 +0000 (19:33 +0200)]
Merge pull request #1632 from ceph/bluestore-redundant-options

osd: remove redundant options to enable bluestore

8 years agoTests: Add bluestore tests 1632/head
Guillaume Abrioux [Tue, 4 Jul 2017 15:12:32 +0000 (17:12 +0200)]
Tests: Add bluestore tests

Add two scenarios bluestore_journal_collocation and bluestore_cluster.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoosd: ability to set db and wal to bluestore
Sébastien Han [Thu, 29 Jun 2017 15:34:54 +0000 (17:34 +0200)]
osd: ability to set db and wal to bluestore

This commits refactors how we deploy bluestore. We have existing
scenarios that we don't want to change too much. This commits eases the
user experience by now changing the way you use scenarios. Bluestore is
just a different interface to store objects but the scenarios more or
less remain the same.

If you set osd_objectstore == 'bluestore' along with
journal_collocation: true, you will get an OSD running bluestore with DB
and WAL partitions on the same device.

If you set osd_objectstore == 'bluestore' along with
raw_multi_journal: true, you will get an OSD running bluestore with a
dedicated drive for the rocksdb DB, then the remaining
drives (used with 'devices') will have WAL and DATA collocated.

If you set osd_objectstore == 'bluestore' along with
raw_multi_journal: true and declare bluestore_wal_devices you will get
an OSD running bluestore with a dedicated drive for rocksdb db, a
dedicated drive partition for rocksdb WAL and a dedicated drive for
DATA.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1597 from czunker/openstack_pools_with_rule
Sébastien Han [Tue, 4 Jul 2017 16:34:00 +0000 (18:34 +0200)]
Merge pull request #1597 from czunker/openstack_pools_with_rule

Create OpenStack pools with crush rule

8 years agoosd: remove redundant options to enable bluestore
Sébastien Han [Thu, 29 Jun 2017 14:52:33 +0000 (16:52 +0200)]
osd: remove redundant options to enable bluestore

There is no need for 2 variables to enable bluestore, prior to this
patch one had to do the following to activate bluestore:

osd_objectstore: bluestore
bluestore: true

Now you just need to set `osd_objectstore: bluestore`.

Fixes: https://github.com/ceph/ceph-ansible/issues/1475
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1646 from ceph/fix_check_mandatory_vars
Sébastien Han [Tue, 4 Jul 2017 16:20:52 +0000 (18:20 +0200)]
Merge pull request #1646 from ceph/fix_check_mandatory_vars

Docker-common: Add missing variables declaration

8 years agoRefact: remove ceph_mon_docker_interface variable 1646/head
Guillaume Abrioux [Tue, 4 Jul 2017 16:08:59 +0000 (18:08 +0200)]
Refact: remove ceph_mon_docker_interface variable

remove `ceph_mon_docker_interface` and use `monitor_interface` instead
for both containerized and non-containerized deployment.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoCommon: monitor_address_block is always defined
Guillaume Abrioux [Tue, 4 Jul 2017 15:29:26 +0000 (17:29 +0200)]
Common: monitor_address_block is always defined

monitor_address_block is always defined.
We need to check for true or false instead.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoDocker-common: Add missing variables declaration
Guillaume Abrioux [Tue, 4 Jul 2017 14:43:58 +0000 (16:43 +0200)]
Docker-common: Add missing variables declaration

Some variables are missing from ceph-docker-common role since the
include of check_mandatory_vars.yml has been re-added in the ceph-mon
role.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1594 from ceph/ipv6_support
Sébastien Han [Tue, 4 Jul 2017 13:08:47 +0000 (15:08 +0200)]
Merge pull request #1594 from ceph/ipv6_support

Common: Add ipv6 support

8 years agoAdd python-netaddr dependency 1594/head
Guillaume Abrioux [Mon, 3 Jul 2017 14:07:54 +0000 (16:07 +0200)]
Add python-netaddr dependency

the monitor_address_block feature requires `python-netaddr` package.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMon: Readd the include of check_mandatory_vars.yml
Guillaume Abrioux [Mon, 3 Jul 2017 13:54:43 +0000 (15:54 +0200)]
Mon: Readd the include of check_mandatory_vars.yml

The check regarding the networking scenario configuration has been
moved from ceph-common to ceph-mon in 1de8176 but the include was not re-added
in 189f4fe

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoDoc: Add a note to clarify how to setup network
Guillaume Abrioux [Wed, 21 Jun 2017 13:55:41 +0000 (15:55 +0200)]
Doc: Add a note to clarify how to setup network

Explain how to setup networking in ceph-ansible by adding a note in
README.md.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoTests: update tests according to ipv6 support
Guillaume Abrioux [Wed, 21 Jun 2017 12:14:35 +0000 (14:14 +0200)]
Tests: update tests according to ipv6 support

Since ceph.conf.j2 has been updated to add ipv6 support, the different
variables in many scenarios need to be updated.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoCommon: Add ipv6 support
Guillaume Abrioux [Wed, 7 Jun 2017 11:26:04 +0000 (13:26 +0200)]
Common: Add ipv6 support

e8187f6 does not fix the ipv6 as expected since `ansible_default_*` are
filled with the IP address carried by the network interface used by the
default gateway route. By the way, it assumes that the MON_IP address will
be this IP address which is not always the case.

We need to keep using the previous fact but add some intelligence in the
template to determine how to retrieve the ipv4|ipv6 address since the path
to the fact in `hostvars` is not the same according to ipv4 vs ipv6 case.

Fix: 1569

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoCreate OpenStack pools with crush rule 1597/head
Christian Zunker [Mon, 12 Jun 2017 08:36:29 +0000 (08:36 +0000)]
Create OpenStack pools with crush rule

Add an extra variable to the openstack pools, which creates them with
defined rules. This will allow to place different pools on e.g.
different type of disks.

This commit will also set a new default rule when defined and move
the rbd pool to the new rule.

8 years agoMerge pull request #1636 from fghaas/fix-mon-directory-perms
Sébastien Han [Mon, 3 Jul 2017 09:19:53 +0000 (11:19 +0200)]
Merge pull request #1636 from fghaas/fix-mon-directory-perms

Ensure that ceph-mon applies mon directory ownership recursively

8 years agoMerge pull request #1633 from fullerdj/wip-djf-osd-seatbelt
Sébastien Han [Fri, 30 Jun 2017 08:58:41 +0000 (10:58 +0200)]
Merge pull request #1633 from fullerdj/wip-djf-osd-seatbelt

ansible: fail if user selects OSD auto detection and raw devices are …

8 years agoEnsure that ceph-mon applies mon directory ownership recursively 1636/head
Florian Haas [Fri, 30 Jun 2017 08:17:23 +0000 (10:17 +0200)]
Ensure that ceph-mon applies mon directory ownership recursively

Fixes #1635.

Signed-off-by: Florian Haas <florian@hastexo.com>
8 years agoansible: fail if user selects OSD auto detection and raw devices are mounted 1633/head
Douglas Fuller [Thu, 29 Jun 2017 15:53:44 +0000 (15:53 +0000)]
ansible: fail if user selects OSD auto detection and raw devices are mounted

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
8 years agoMerge pull request #1629 from ceph/fix-openstack-key
Sébastien Han [Tue, 27 Jun 2017 12:58:36 +0000 (14:58 +0200)]
Merge pull request #1629 from ceph/fix-openstack-key

mon: fix openstack key creation

8 years agomon: fix openstack key creation 1629/head
Sébastien Han [Tue, 27 Jun 2017 09:47:02 +0000 (11:47 +0200)]
mon: fix openstack key creation

Somehow the shell module will return an error if the command line is not
next to it.
Plus fixed the import with the right path.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1626 from ceph/fix_followup
Sébastien Han [Mon, 26 Jun 2017 16:07:06 +0000 (18:07 +0200)]
Merge pull request #1626 from ceph/fix_followup

Fix followup

8 years agoFix followup on refact code (1469) 1626/head
Guillaume Abrioux [Mon, 26 Jun 2017 13:28:30 +0000 (15:28 +0200)]
Fix followup on refact code (1469)

In addition to 7bb04a5, these lines are no longer needed and can even
cause playbook failures.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1621 from ceph/openstack-key
Sébastien Han [Mon, 26 Jun 2017 12:39:05 +0000 (14:39 +0200)]
Merge pull request #1621 from ceph/openstack-key

mon: rework openstack keys creation

8 years agoMerge pull request #1624 from ceph/chose-ceph-config-location
Sébastien Han [Mon, 26 Jun 2017 12:38:54 +0000 (14:38 +0200)]
Merge pull request #1624 from ceph/chose-ceph-config-location

Choose ceph config location

8 years agomon: rework openstack keys creation 1621/head
Sébastien Han [Fri, 23 Jun 2017 10:35:39 +0000 (12:35 +0200)]
mon: rework openstack keys creation

We now allow a user to pass a key secret.

Fixes: https://github.com/ceph/ceph-ansible/issues/1617
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agodocker: ability to change ceph config directory 1624/head
Sébastien Han [Fri, 23 Jun 2017 14:05:35 +0000 (16:05 +0200)]
docker: ability to change ceph config directory

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agodocker: refactor followup
Sébastien Han [Fri, 23 Jun 2017 14:16:06 +0000 (16:16 +0200)]
docker: refactor followup

Followup on https://github.com/ceph/ceph-ansible/pull/1469 where we
merged most of the container code from roles/ceph-*/task/docker/*.yml
into roles/ceph-docker-common/tasks/

It seems that we forgot to remove the original files.

Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1620 from ceph/fix_bashism
Sébastien Han [Fri, 23 Jun 2017 12:57:42 +0000 (14:57 +0200)]
Merge pull request #1620 from ceph/fix_bashism

Make the new check PGs working with /bin/sh

8 years agoMerge pull request #1616 from ceph/disable-retry-file
Andrew Schoen [Thu, 22 Jun 2017 17:44:34 +0000 (12:44 -0500)]
Merge pull request #1616 from ceph/disable-retry-file

ansible: disable retry files

8 years agoMake the new check PGs working with /bin/sh 1620/head
Guillaume Abrioux [Thu, 22 Jun 2017 15:42:03 +0000 (17:42 +0200)]
Make the new check PGs working with /bin/sh

The new test in the checks PGs are no longer working on distributions
where /bin/sh isn't linked to /bin/bash.

Fix: #1619
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoansible: disable retry files 1616/head
Sébastien Han [Thu, 22 Jun 2017 13:55:19 +0000 (15:55 +0200)]
ansible: disable retry files

Closes: https://github.com/ceph/ceph-ansible/issues/1611
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1613 from ceph/wip-takeover
Sébastien Han [Wed, 21 Jun 2017 14:06:09 +0000 (16:06 +0200)]
Merge pull request #1613 from ceph/wip-takeover

Fixes to take-over-existing-cluster playbook

8 years agoinfra: Create a backup of ceph.conf when taking over existing cluster 1613/head
David Galloway [Tue, 20 Jun 2017 17:49:31 +0000 (13:49 -0400)]
infra: Create a backup of ceph.conf when taking over existing cluster

Signed-off-by: David Galloway <dgallowa@redhat.com>
8 years agoinfra: Fix ceph.conf creation when taking over existing cluster
David Galloway [Tue, 20 Jun 2017 16:34:46 +0000 (12:34 -0400)]
infra: Fix ceph.conf creation when taking over existing cluster

Fixes bug introduced in https://github.com/ceph/ceph-ansible/pull/1330

The "stat ceph.conf" task was basically using the stat module on a
string instead of the ceph.conf filename.  This caused the "generate
ceph configuration file" task to fail.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1463382
Signed-off-by: David Galloway <dgallowa@redhat.com>
8 years agoMerge pull request #1612 from fultonj/add_openstack_metrics_pool
Sébastien Han [Tue, 20 Jun 2017 08:53:16 +0000 (10:53 +0200)]
Merge pull request #1612 from fultonj/add_openstack_metrics_pool

Add OpenStack metrics pool

8 years agoAdd OpenStack metrics pool 1612/head
John Fulton [Mon, 19 Jun 2017 18:25:59 +0000 (14:25 -0400)]
Add OpenStack metrics pool

OpenStack's Gnocchi service expects to have a pool called "metrics".
This change addess "metrics" to the list of `openstack_pools` and
creates a corresponding key. It is only run if the user sets
`openstack_config: false`.

8 years agoMerge pull request #1595 from czunker/restart_all_osds
Sébastien Han [Fri, 16 Jun 2017 09:15:47 +0000 (11:15 +0200)]
Merge pull request #1595 from czunker/restart_all_osds

Restart all OSDs and do not stop after the first one.

8 years agoMerge pull request #1609 from ceph/quick_clean
Sébastien Han [Thu, 15 Jun 2017 14:57:09 +0000 (16:57 +0200)]
Merge pull request #1609 from ceph/quick_clean

Remove duplicate entry in a test Vagrantfile

8 years agoRemove duplicate entry in test Vagrantfile 1609/head
Guillaume Abrioux [Thu, 15 Jun 2017 14:39:51 +0000 (16:39 +0200)]
Remove duplicate entry in test Vagrantfile

remove some leftover since code has been refactored

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoRestart all OSDs and do not stop after the first one. 1595/head
Christian Zunker [Mon, 12 Jun 2017 08:30:22 +0000 (08:30 +0000)]
Restart all OSDs and do not stop after the first one.

The current handler only restarts one OSD on each OSD server. After
the first one the handler stops, not matter what results the checks had.

Co-Authored-By: Gaudenz Steinlin (@gaudenz)
8 years agoMerge pull request #1607 from SoneraCloud/bluestore-acivation-fix
Sébastien Han [Wed, 14 Jun 2017 09:36:35 +0000 (11:36 +0200)]
Merge pull request #1607 from SoneraCloud/bluestore-acivation-fix

Bluestore: Omit "osd mkfs type" etc from ceph.conf

8 years agoBluestore: Omit "osd mkfs type" etc from ceph.conf 1607/head
Peter Jenkins [Wed, 14 Jun 2017 07:44:13 +0000 (10:44 +0300)]
Bluestore: Omit "osd mkfs type" etc from ceph.conf

Remove "osd mkfs type" and the other pre-Bluestore parameters from the
generated ceph.conf so that disk activation on OSDs will work. The
current default xfs config results in a failed deployment and
incorrect partition metadata.

8 years agoMerge pull request #1599 from ceph/bz-1458024
Sébastien Han [Tue, 13 Jun 2017 16:00:06 +0000 (18:00 +0200)]
Merge pull request #1599 from ceph/bz-1458024

tests: adds a test for rolling updates of containerized clusters

8 years agoMerge pull request #1598 from ceph/test-rbd-pool
Andrew Schoen [Tue, 13 Jun 2017 15:04:57 +0000 (10:04 -0500)]
Merge pull request #1598 from ceph/test-rbd-pool

ceph-mon: fix get rbd size hanging

8 years agorolling_update: set health_mon_check_delay to 15 1599/head
Andrew Schoen [Mon, 12 Jun 2017 21:07:52 +0000 (16:07 -0500)]
rolling_update: set health_mon_check_delay to 15

The old value of 10 did not give enough time for a containerized mon to
pass the health check.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: add PG config to the docker_cluster scenario
Andrew Schoen [Wed, 7 Jun 2017 13:30:17 +0000 (08:30 -0500)]
tests: add PG config to the docker_cluster scenario

This is so we'll pass the PG check when performing a rolling update.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agotests: adds *-update_docker_cluster testing scenarios
Andrew Schoen [Tue, 6 Jun 2017 14:43:14 +0000 (09:43 -0500)]
tests: adds *-update_docker_cluster testing scenarios

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1604 from ceph/rewrite_pgs_clean_tasks
Sébastien Han [Tue, 13 Jun 2017 11:41:42 +0000 (13:41 +0200)]
Merge pull request #1604 from ceph/rewrite_pgs_clean_tasks

rewrite check pgs clean tasks

8 years agorewrite check pgs clean tasks 1604/head
Guillaume Abrioux [Tue, 13 Jun 2017 07:37:13 +0000 (09:37 +0200)]
rewrite check pgs clean tasks

Avoid screen scrapping by rewriting `waiting for clean pgs` tasks like it is
done in 304de48.

Use the json output returned by `ceph -s` instead

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1573 from duritong/master-control_path-port
Sébastien Han [Mon, 12 Jun 2017 13:05:11 +0000 (15:05 +0200)]
Merge pull request #1573 from duritong/master-control_path-port

keep port as part of the control path

8 years agoceph-mon: fix get rbd size hanging 1598/head
Sébastien Han [Mon, 12 Jun 2017 12:38:10 +0000 (14:38 +0200)]
ceph-mon: fix get rbd size hanging

For newly created cluster the command: ceph --cluster {{ cluster }} osd
pool get rbd size does not respond properly.
We only want to check if the rbd pool exists, so we know use an ls |
grep approach.

Closes: https://github.com/ceph/ceph-ansible/issues/1547
Signed-off-by: Sébastien Han <seb@redhat.com>
8 years agoMerge pull request #1584 from ceph/rewrite_check_pgs
Alfredo Deza [Mon, 12 Jun 2017 11:52:29 +0000 (07:52 -0400)]
Merge pull request #1584 from ceph/rewrite_check_pgs

Common: Rewrite check_pgs

8 years agoCommon: Rewrite check_pgs 1584/head
Guillaume Abrioux [Mon, 5 Jun 2017 09:21:32 +0000 (11:21 +0200)]
Common: Rewrite check_pgs

Rewrite the check_pgs by using json parsing instead of complex regexp to
parse the `ceph -s` output.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1590 from ceph/fix_ceph_docker_on_openstack
Andrew Schoen [Wed, 7 Jun 2017 13:50:21 +0000 (08:50 -0500)]
Merge pull request #1590 from ceph/fix_ceph_docker_on_openstack

Common: Add a default for ceph_docker_on_openstack

8 years agoMerge pull request #1589 from ceph/bz-1454945
Andrew Schoen [Tue, 6 Jun 2017 15:17:44 +0000 (10:17 -0500)]
Merge pull request #1589 from ceph/bz-1454945

remove ceph-iscsi-gw play from site.yml.sample

8 years agoCommon: Add a default for ceph_docker_on_openstack 1590/head
Guillaume Abrioux [Tue, 6 Jun 2017 14:46:44 +0000 (16:46 +0200)]
Common: Add a default for ceph_docker_on_openstack

Add a default value for `ceph_docker_on_openstack` to avoid a
conditional check error for the task `pause after docker install before starting` in
`roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml`

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoremove ceph-iscsi-gw play from site.yml.sample 1589/head
Andrew Schoen [Tue, 6 Jun 2017 14:04:58 +0000 (09:04 -0500)]
remove ceph-iscsi-gw play from site.yml.sample

We ship ceph-iscsi-gw in a separate repo downstream and do not package
it with ceph-ansible. Including the play for ceph-iscsi-gw in
site.yml.sample makes the playbook fail when using the downstream
packages.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1454945
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1586 from ceph/rpm-strip-iscsi
Andrew Schoen [Mon, 5 Jun 2017 18:46:41 +0000 (13:46 -0500)]
Merge pull request #1586 from ceph/rpm-strip-iscsi

rpm: do not package iscsi files

8 years agoMerge pull request #1587 from ceph/bz-1451786
Gregory Meno [Mon, 5 Jun 2017 18:14:49 +0000 (11:14 -0700)]
Merge pull request #1587 from ceph/bz-1451786

ceph-mon: fix support for ipv6 on containerized mons

8 years agoceph-mon: fix support for ipv6 on containerized mons 1587/head
Andrew Schoen [Mon, 5 Jun 2017 15:51:47 +0000 (10:51 -0500)]
ceph-mon: fix support for ipv6 on containerized mons

The fact ['ansible_$interface']['ipv4'] is a dictionary where
['ansible_$interface']['ipv6'] is a list. If we use
ansible_default_ipv6|ipv4 is is always a dictionary which allows us to
get the ipv6 and ipv4 address without adding more complexity to the
template.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agorpm: do not package iscsi files 1586/head
Ken Dreyer [Mon, 5 Jun 2017 15:17:59 +0000 (09:17 -0600)]
rpm: do not package iscsi files

Currently we cannot install the ceph-iscsi-ansible RPM on a node where
the ceph-ansible RPM is already installed.

ceph-iscsi-ansible should install on top of the ceph-ansible environment
without issues.

8 years agoMerge pull request #1582 from ceph/purge-docker-fix
Andrew Schoen [Mon, 5 Jun 2017 14:31:53 +0000 (09:31 -0500)]
Merge pull request #1582 from ceph/purge-docker-fix

purge-docker-cluster: include ceph_docker_registry

8 years agopurge-docker-cluster: include ceph_docker_registry 1582/head
Andrew Schoen [Fri, 2 Jun 2017 12:42:34 +0000 (07:42 -0500)]
purge-docker-cluster: include ceph_docker_registry

We need to include ceph_docker_registry when removing containers/images
because if we don't it will assume docker.io which is not always where
the image originated from, causing the playbook to fail.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1469 from ceph/refact_code
Sébastien Han [Fri, 2 Jun 2017 10:40:25 +0000 (12:40 +0200)]
Merge pull request #1469 from ceph/refact_code

Docker: Refact code

8 years agoMerge pull request #1580 from ceph/fix_check_pgs
Sébastien Han [Fri, 2 Jun 2017 10:11:05 +0000 (12:11 +0200)]
Merge pull request #1580 from ceph/fix_check_pgs

Common: Improve check pgs

8 years agoCommon: Improve check pgs 1580/head
Guillaume Abrioux [Thu, 1 Jun 2017 12:46:13 +0000 (14:46 +0200)]
Common: Improve check pgs

For some reason we changed the check of pgs but it appears it could be
dangerous because the current check might satisfied as long as 1 PG is
active+clean.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1579 from ceph/fix_ceph-osd-run
Sébastien Han [Thu, 1 Jun 2017 14:22:45 +0000 (16:22 +0200)]
Merge pull request #1579 from ceph/fix_ceph-osd-run

Docker: Remove duplicate var passed to docker-run

8 years agoDocker: Remove duplicate var passed to docker-run 1579/head
Guillaume Abrioux [Thu, 1 Jun 2017 12:31:17 +0000 (14:31 +0200)]
Docker: Remove duplicate var passed to docker-run

since `-e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE` is already hardcoded in
`eph-osd-run.sh.j2` there is no need to add `-e
CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE` as a default value in defaults vars.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
8 years agoMerge pull request #1577 from ceph/purge-tests
Andrew Schoen [Wed, 31 May 2017 20:18:14 +0000 (15:18 -0500)]
Merge pull request #1577 from ceph/purge-tests

tests: use docker playbook when redeploying a purged cluster

8 years agotests: use docker playbook when redeploying a purged cluster 1577/head
Andrew Schoen [Wed, 31 May 2017 16:53:37 +0000 (11:53 -0500)]
tests: use docker playbook when redeploying a purged cluster

When we purge a containerized cluster we need to use the correct
playbook when redploying the cluster.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
8 years agoMerge pull request #1568 from ceph/bz-1455187
Sébastien Han [Wed, 31 May 2017 14:53:36 +0000 (16:53 +0200)]
Merge pull request #1568 from ceph/bz-1455187

purge-docker-cluster fix and test