68a1390dc9
Merge pull request #1898 from ceph/restart-mon
...
defaults: restart docker daemon higher delay
2017-09-15 06:23:51 -06:00
ec4453b602
Merge pull request #1901 from ceph/rpm-ansible-2.3
...
rpm: require Ansible 2.3.1.0
2017-09-14 17:05:08 -06:00
3f90a67ac2
rpm: require Ansible 2.3.1.0
...
We require a newer verison of Ansible now.
2017-09-14 16:12:06 -06:00
8b7c83c300
Merge pull request #1899 from ceph/rpm-obsoletes-iscsi
...
rpm: Obsoletes ceph-iscsi-ansible
2017-09-14 14:18:02 -06:00
05c7fcea9c
rpm: Obsoletes ceph-iscsi-ansible
...
The ceph-iscsi-ansible project has moved into ceph-ansible now. Make the
ceph-ansible package obsolete the ceph-iscsi-ansible package. With this
change, Yum updates will seamlessly uninstall the ceph-iscsi-ansible
package.
2017-09-14 14:12:09 -06:00
3321b9359b
Merge pull request #1895 from ceph/rhcs-on-rhel
...
rpm: ship different yml samples on RHEL vs CentOS
2017-09-14 13:44:05 -06:00
ed3003cf41
defaults: restart docker daemon higher delay
...
Use default delay since the mon (in particular) can take more time to
restart.
Solves error with:
STDERR:
Error response from daemon: No such container: ceph-mon-mon0
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-14 13:38:11 -06:00
fcb0a01e28
Merge pull request #1894 from ceph/mgr-version
...
mon: create the mgr key for release >= luminous
2017-09-14 13:47:09 -05:00
93bd78eee9
rpm: ship different yml samples on RHEL vs CentOS
...
When building the RPM on CentOS, we will ship the all.yml.sample file
and delete rhcs.yml.sample.
When building the RPM on RHEL, we will ship the rhcs.yml.sample file and
delete all.yml.sample.
2017-09-14 11:22:37 -06:00
fb02b1d9d3
mon: create the mgr key for release >= luminous
...
This fixes RHCS builds. We know which Ceph version we are running on.
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-14 11:06:44 -06:00
0d3b1b8d1f
Merge pull request #1893 from ceph/rgw-socker
...
rgw: remove old variables
2017-09-14 10:52:30 -06:00
5eff7e24b0
Merge pull request #1890 from ceph/lvm-setup
...
tests: fix lvm_setup.yml for purge_cluster.yml
2017-09-14 11:38:13 -05:00
6f0b1fe803
rgw: remove old variables
...
Since the only support civetweb these variables are obsolete.
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-14 09:42:50 -06:00
fe1d84d395
Merge pull request #1892 from ceph/purge-dmcrypt-col
...
purge: only purge specific directories for mon
2017-09-13 17:57:06 -06:00
ef8d37dd0d
Merge pull request #1800 from ceph/wip-osd-start-fix
...
ceph-osd: Fix osd start sequence
2017-09-13 17:20:10 -06:00
ba3e3b6cc7
purge: only purge specific directories for mon
...
Handles the case when a mon is collocated with an OSD.
Closes: https://github.com/ceph/ceph-ansible/issues/1877
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-13 17:07:04 -06:00
82c4848ec4
Merge pull request #1885 from ceph/shrink-osd
...
shrink-osd: fix when multiple osds
2017-09-13 16:12:49 -06:00
3031e51778
shrink-osd: fix when multiple osds
...
The loop was being built properly so we were always getting the last
item as osd host.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1490355
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-13 15:20:11 -06:00
2f51f0de28
Merge pull request #1880 from ceph/wip-rgw-nfs
...
nfs: configure RGW FSAL to start up correctly
2017-09-13 14:20:14 -06:00
57f2ad7ef1
tests: delete journal partitions in lvm_setup.yml
...
Delete these before creating them incase they are left around in a purge
cluster testing scenario. The purge-cluster.yml playbook does not
currently remove partitions used for journals.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-09-13 15:02:54 -05:00
f67b47d056
Merge pull request #1882 from ceph/multi-journal
...
osd: drop support for device partition
2017-09-13 11:43:48 -06:00
911fa2019f
Merge pull request #1888 from ceph/make-srpm-rpmbuild
...
Makefile: remove fedpkg dependency for "srpm"
2017-09-13 11:41:10 -06:00
323d59b786
Makefile: remove fedpkg dependency for "srpm"
...
It's not currently possible to install EPEL 7's fedpkg alongside the
centos-packager package in CentOS 7 Extras (for /usr/bin/cbs), because
they each depend on slightly different Koji package versions.
This means that we cannot run "make srpm" on a system where
centos-packager is installed, because that depends on fedpkg.
Remove the dependency on fedpkg for the "srpm" target, and run
rpmbuild -bs directly.
The purpose of this change is to make it easier to automatically
build ceph-ansible SRPMs in Jenkins/cbs.centos.org.
2017-09-13 10:46:37 -06:00
ac62437609
Merge pull request #1883 from ceph/quick_refact
...
osd: refact include of `activate_osds.yml`
2017-09-12 22:11:31 -06:00
c3866fc4bd
Merge pull request #1747 from ceph/add-iscsi
...
resync ceph-iscsi-gw with old upstream
2017-09-13 02:06:50 +02:00
aa364264cd
resync ceph-iscsi-gw with old upstream
...
Taken from https://github.com/pcuzner/ceph-iscsi-ansible/tree/tcmu-fixes
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1454945 and
https://bugzilla.redhat.com/show_bug.cgi?id=1484083
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-12 18:06:10 -06:00
2a1b8a1997
Merge pull request #1884 from ceph/mon-container-ip
...
mon: add support for monitor_address block for containers
2017-09-13 01:46:18 +02:00
fdf924401f
osd: drop support for device partition
...
We have been struggling with this, it's still broken and breaking other
things too now.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1490283
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-12 17:42:07 -06:00
49ad8528e5
osd: refact include of `activate_osds.yml`
...
remove duplicate code.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-09-12 16:53:11 -06:00
02ba65dbbe
mon: add support for monitor_address block for containers
...
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-12 16:28:08 -06:00
6b8ed0440e
Merge pull request #1761 from ceph/split_copy_keys
...
docker: split the task 'copy ceph configs&keys'
2017-09-13 00:21:50 +02:00
52efe92a87
nfs: configure RGW FSAL to start up correctly
...
- Add RGW keyring to nfs node
- Add RGW section to ganesha.conf
- Add RGW section to ceph.conf onf nfs node
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2017-09-12 16:27:16 -04:00
61357c8e20
tests: no need to create a filesystem on /dev/sdc1 for lvm tests
...
The partition only needs created and given a gpt label so that a
PARTUUID will exist on the partition.
This task also makes the purge_lvm_osds scenario fail on the second
deployment after purging.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-09-12 15:14:21 -05:00
383aa68be9
Merge pull request #1881 from ceph/followup_1724
...
ceph-osd: remove deprecated comment in sample file
2017-09-12 17:43:19 +02:00
20946f7220
ceph-osd: remove deprecated comment in sample file
...
Since #1724 has been merged, this comment is deprecated
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-09-12 16:48:10 +02:00
0f506f4f0a
Docker: split the task 'copy ceph configs&keys'
...
All keys are copied to all nodes.
This commit split that task in each roles so keys are copied to their
respective nodes.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1488999
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-09-11 21:14:13 +02:00
358b3b588d
Merge pull request #1863 from ceph/rpm-comments
...
rpm: better comments for file removals
2017-09-09 12:02:42 +02:00
30ecbca3fc
Merge pull request #1840 from ceph/simply-containers
...
docker: simplify variable declaration
2017-09-09 02:35:11 +02:00
2ea7f287fa
docker: simplify variable declaration
...
Less configuration for the user, the container inherit from the global
variables. No more container specific variables.
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-09 01:22:06 +02:00
4767eaaab3
Merge pull request #1878 from ceph/add-rbd-mirror
...
Add rbd mirror
2017-09-09 01:21:12 +02:00
7054615551
ci: deploy rbd mirror
...
Deploy rbd mirorr in cluster scenario
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-09 01:17:10 +02:00
6d90aef114
Merge pull request #1875 from ceph/switch-nfs
...
switch to container: fix ceph nfs
2017-09-09 01:09:30 +02:00
477f86e305
switch to container: fix ceph nfs
...
The service is nfs-ganesha where ceph-nfs@{{ ansible_hostname }} will be
the name of the container.
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-08 22:43:50 +02:00
4f325c7ebe
ci: remove scenario bluestore_docker_cluster
...
We don't need to bootstrap a full cluster to bootstrap bluestore. We
have individual scenarios for that.
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-08 19:33:24 +02:00
d46d453b83
Merge pull request #1780 from ceph/wip-rgw-nfs
...
Wip RGW NFS
2017-09-08 19:26:02 +02:00
b59e9cc732
Merge pull request #1871 from ceph/handler-collocate
...
defaults: do not restart unconfigured (yet) daemons
2017-09-08 18:15:02 +02:00
a05c58ba37
Merge pull request #1874 from ceph/rbd-mirror-mem
...
ceph-rbd-mirror; docker fix typo
2017-09-08 17:50:55 +02:00
7a93d88025
ceph-rbd-mirror; docker fix typo
...
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-08 17:47:48 +02:00
f8171e8b4a
nfs: rename host to have ceph- prefix
...
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2017-09-08 11:38:05 -04:00
f3e2235b3a
nfs-ganesha: add config overrides section
...
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2017-09-08 11:37:58 -04:00
Sébastien Han
Ken Dreyer
Andrew Schoen
Andrew Schoen
Guillaume Abrioux
Ali Maredia