Commit Graph

2074 Commits (8edc2663d9aae949c4b76661b5d240699a97c772)
 

Author SHA1 Message Date
Patrick Donnelly bcb2e39017
ceph.conf: add variable setting monitor addr block
For some providers (such as upcoming Linode support), some NICs may have
multiple IP addresses. (In the case of Linode, the only NIC has a public
and private IP address.) This is normally okay as we can use the
ceph.conf cluster_network and public_network variables to force the
monitor to listen on the addresses we want. However, we also need
ansible to set the correct monitor IP addresses in "mon hosts" (i.e. the
addresses the monitors will listen on!). This new monitor_address_block
setting tells ansible which IP address to use for each monitor.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-09-19 17:35:41 -04:00
Leseb 112a2b2970 Merge pull request #980 from batrick/deploy_monitors-py2
deploy_monitors: use python2 for v2 code
2016-09-19 09:42:56 +02:00
Patrick Donnelly 35c64f91f4
deploy_monitors: use python2 for v2 code
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-09-18 20:42:14 -04:00
Leseb 2af46451e7 Merge pull request #978 from FranBarrera/openstack-add-floating-ip
Add floating_ip_pool openstack
2016-09-16 15:42:48 +02:00
FranBarrera 4900f8fe89 Add floating-ip openstack
Signed-off-by: FranBarrera <FranBarrera6@gmail.com>
2016-09-15 14:25:03 +02:00
Leseb 19b3caef2b Merge pull request #976 from FranBarrera/add-openstack-net
Add network Openstack
2016-09-13 14:21:41 +02:00
FranBarrera daf5094ede Add net openstack
Signed-off-by: FranBarrera <franbarrera6@gmail.com>
2016-09-13 14:14:07 +02:00
FranBarrera 100a099c98 Revert "Add net openstack"
This reverts commit 4e4433cd81.
2016-09-13 14:08:54 +02:00
FranBarrera 11e502a1d9 Revert "add net in vagrant_variables.yml.sample"
This reverts commit a0172d4238.
2016-09-13 14:06:31 +02:00
FranBarrera a0172d4238 add net in vagrant_variables.yml.sample
Signed-off-by: FranBarrera <franbarrera6@gmail.com>
2016-09-13 13:58:04 +02:00
FranBarrera 4e4433cd81 Add net openstack
Signed-off-by: FranBarrera <franbarrera6@gmail.com>
2016-09-13 13:53:11 +02:00
Leseb 333b620f9d Merge pull request #975 from ceph/remove-compact-upggrade
rolling updates: remove mon compact command
2016-09-13 10:11:46 +02:00
Sébastien Han 21356c653f rolling updates: remove mon compact command
Users have reported this task to hang. Since this command is not
required to perform the upgrade, we remove it.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-09-13 10:09:07 +02:00
Leseb 5298de3ef5 Merge pull request #972 from racpatel/fix-rolling_update
rolling_update.yml will not work if cluster name is other than ceph
2016-09-10 14:14:21 +02:00
James Saint-Rossy d4a60a9394 Added ceph_release generation and fixed missing whitespace in ceph_release checks 2016-09-09 18:16:41 -04:00
James Saint-Rossy 666637f715 Replaced is_before is_after is_ booleans with numerical version dictionary 2016-09-09 17:34:26 -04:00
Rachana Patel ad5805f03e rolling_update.yml will not work if cluster name is not 'ceph'. Adding --cluster will solve this problem
Fixes issue #969

Signed-off-by: Rachana Patel <rachana83.patel@gmail.com>
2016-09-07 15:38:58 -04:00
James Saint-Rossy f52be23770 Prevent local_action from requiring root 2016-09-02 19:31:59 -04:00
James Saint-Rossy 9d97ffed30 Rebasing with upstream 2016-08-31 17:13:09 -04:00
Sébastien Han b5627155a8 common: add gluster ganesha repo on Debian
should fix: #964

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-08-30 17:01:07 +02:00
Leseb ca4d4482ef Merge pull request #960 from ceph/prepare-lrbd
iscsi-gw: preparing the new iscsi role
2016-08-26 15:30:02 +02:00
Sébastien Han d3ceab904d iscsi-gw: preparing the new iscsi role
adding the bare minimum to test and start the new role.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-08-26 15:29:07 +02:00
Sébastien Han 64cb2dba68 groups_vars update
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-08-26 13:33:59 +02:00
Sébastien Han 5b4dab3c89 Merge branch 'master' of github.com:ceph/ceph-ansible 2016-08-26 13:32:50 +02:00
Sébastien Han 923c40fc61 common: declare raw_journal_devices
So we can safely pass the check and avoid the undeclared variable error.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-08-26 13:31:45 +02:00
Leseb 6b37c21cf1 Merge pull request #959 from font/nfs
NFS fixes
2016-08-26 10:36:17 +02:00
Ivan Font 94f8d8540a NFS fixes
- Move mon_containerized_default_ceph_conf_with_kv config from ceph-mon
  to ceph-common defaults as it's used in ceph-nfs
- Update conditional to generate ganesha config when not
  mon_containerized_default_ceph_conf_with_kv
- Revert change to store radosgw keyring using ansible_hostname on
  ansible server so that ceph-nfs can find it
- Update ceph-ceph-nfs0-rgw-user container to use ansible_hostname
  variable

Signed-off-by: Ivan Font <ivan.font@redhat.com>
2016-08-25 22:41:31 -07:00
Leseb a41eddf6f0 Merge pull request #957 from gbraad/patch-readme
Correct naming of referenced file
2016-08-25 09:58:29 +02:00
Leseb fc5f32409f Merge pull request #956 from gbraad/patch-1
Correct a small typo
2016-08-25 09:56:03 +02:00
Gerard Braad 04ee3a9ee2 Correct naming of referenced file 2016-08-25 03:19:41 +00:00
Gerard Braad df4d0741f7 Correct a small typo and description 2016-08-25 02:20:14 +00:00
Leseb 8719b3556c Merge pull request #955 from font/rgw
Fix for ceph-rgw role
2016-08-24 09:48:56 +02:00
Leseb 8246e58a8f Merge pull request #954 from font/purge
Update relative path to include vars
2016-08-24 09:45:33 +02:00
Leseb e017386645 Merge pull request #951 from ceph/fix-docker-cluster-name
Fix docker cluster name
2016-08-24 09:44:40 +02:00
Ivan Font 2073a72b39 Fix for ceph-rgw role
- Short-circuit conditional to prevent dereferencing an undefined
  dictionary variable

Signed-off-by: Ivan Font <ivan.font@redhat.com>
2016-08-24 00:30:05 -07:00
Ivan Font 05c5d1ea91 Update relative path to include vars
Signed-off-by: Ivan Font <ivan.font@redhat.com>
2016-08-24 00:27:54 -07:00
Sébastien Han 708c43a04e docker: fix osd configuration
use the activation scenario instead of the full ceph_disk one, we
already have a task to prepare osds so we just need to activate the
device.

working for me using vagrant :)

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-08-24 09:05:14 +02:00
Sébastien Han a4dbe49f7f docker: fix more than one monitor deployment
There is no need to run the actions from
roles/ceph-mon/tasks/docker/create_configs.yml
on the first monitor only since the monitor deployment happens
**serially**.
Moreover with Vagrant it's useful to allow the auto creation of the
cluster fsid, so enabling the option. If this is not desired you can
still set `fsid: 9c9c0448-0551-401d-b55b-e5b3a42bae42` for example.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-08-24 09:05:14 +02:00
Sébastien Han f351329897 docker: use cluster name
Fix cluster name for docker scenario and other playbooks.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-08-24 09:04:49 +02:00
James Saint-Rossy ab93cd0858 Remove unused use_server_package_split boolean 2016-08-24 00:38:52 -04:00
James Saint-Rossy 7e284920d1 Fixes for Hammer install and added numerical release checks 2016-08-24 00:23:47 -04:00
Leseb 96f7f8b74e Merge pull request #947 from font/cephconf
Restrict fact gathering to mons and update ceph.conf
2016-08-23 12:01:16 +02:00
Leseb a22fa9abe3 Merge pull request #948 from font/rbdmirror
Add ceph-rbd-mirror role to containerized sample playbook
2016-08-23 11:41:48 +02:00
Ivan Font 8a5cbdb724 Add ceph-rbd-mirror role to containerized sample playbook
Signed-off-by: Ivan Font <ivan.font@redhat.com>
2016-08-22 11:23:48 -07:00
Ivan Font ef4d0a39f2 Restrict fact gathering to mons and update ceph.conf
- Gather facts only for mons before processing ceph-mon role serially in
  containerized playbook sample
- Updated ceph.conf in order to generate a valid ceph.conf

Signed-off-by: Ivan Font <ivan.font@redhat.com>
2016-08-22 10:42:27 -07:00
Leseb 6e0dfcd6f9 Merge pull request #945 from ceph/fix-docker
docker: gather all the fact
2016-08-22 10:36:23 +02:00
Sébastien Han 69cad8ecc1 docker: gather all the fact
If we don't do this we won't be able to get the ip address of the docker
interface.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-08-22 10:35:24 +02:00
Leseb 88138324cb Merge pull request #931 from font/rbdmirror_purge
Update for containerized purge cluster playbook
2016-08-19 18:31:46 +02:00
Ivan Font 7c9cb0993e Include group_vars files in purge cluster playbook
- Add all relevant group_vars files in containerized purge cluster
  playbook and ignore errors if file may not exist.
- Also fixing indentation issues.

Signed-off-by: Ivan Font <ivan.font@redhat.com>
2016-08-19 09:11:56 -07:00
Ivan Font c1905bfa23 Update for containerized purge cluster playbook
- Added support for purging containerized rbd-mirror node

Signed-off-by: Ivan Font <ivan.font@redhat.com>
2016-08-19 09:11:56 -07:00