Commit Graph

917 Commits (580a068bd765767392e5cc7a1318bc8b28a6026b)
 

Author SHA1 Message Date
Leseb 685b5f2940 Merge pull request #535 from dang/rgw_addr
Allow RGW and client VMs together
2016-02-11 21:25:14 +01:00
Daniel Gryniewicz 5c52c8070b Allow RGW and client VMs together
RGW and Client VMs were sharing a network range, causing vagrant
failure.  Bump the RGW range to the next value.
2016-02-11 15:16:13 -05:00
Leseb 78cb5cc726 Merge pull request #534 from ceph/fix-osd-typo
ceph-osd: docker: fix type
2016-02-11 17:59:07 +01:00
Sébastien Han a3cc055e61 ceph-osd: docker: fix type
use ceph_osd_docker_devices and not ceph_osd_docker_device

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-11 17:57:10 +01:00
Leseb dfcaf1b6d0 Merge pull request #533 from ceph/use-ansible-version
use the ansible_version variable
2016-02-11 17:52:04 +01:00
Sébastien Han 2d1cec643d use the ansible_version variable
use the builtin variable to check the ansible version

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-11 17:34:44 +01:00
Sébastien Han 61061c7dd6 Merge branch 'master' of github.com:ceph/ceph-ansible 2016-02-10 23:57:01 +01:00
Leseb a1a4848023 Merge pull request #526 from mattt416/issue_525
Change modes to string values
2016-02-10 23:54:29 +01:00
Ben England b0ee3616a5 make sure /etc/fstab is always valid at boot time no matter what 2016-02-09 15:02:55 -05:00
Leseb 86ebee190b Merge pull request #526 from mattt416/issue_525
Change modes to string values
2016-02-09 14:05:05 +01:00
Matt Thompson 14cf9f434e Change modes to string values
Currently deploying a MON fails with "bad symbolic permission for mode"
errors due to the file/directory modes not being interpreted as octal
values.  This commit updates roles/ceph-common/tasks/main.yml to set
the file/directory modes to strings so they can be interpreted
correctly.

Closes issue #525
2016-02-09 09:51:31 +00:00
Leseb 3e075a279a Merge pull request #524 from ceph/fix-typo
ceph-rgw: fix docker typo
2016-02-08 15:26:14 +01:00
Sébastien Han 774966b671 ceph-rgw: fix docker typo
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-08 15:25:24 +01:00
Leseb 18c3bac0d0 Merge pull request #521 from ceph/vagrant-container
ceph-ansible: allow to run containerized daemons
2016-02-07 22:36:38 +01:00
Sébastien Han fa610cabf7 ceph-ansible: allow to run containerized daemons
run containerized daemons in virtual machines.
to enable it simply do:

`cp site-docker.yml.sample site-docker.yml`

and set `docker: true` in `vagrant_variables.yml`

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-07 22:30:32 +01:00
Leseb 047e1afdc5 Merge pull request #519 from ceph/restapi-meta
ceph-restapi: fix meta file
2016-02-05 17:22:14 +01:00
Sébastien Han fd0dd3d89a ceph-restapi: fix meta file
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-05 17:19:54 +01:00
Leseb d050179121 Merge pull request #512 from guits/quick_fix
Refact code using `set_fact` to handle 'legacy' versions
2016-02-05 16:41:35 +01:00
Guillaume Abrioux dcec63adc8 Refact code using `set_fact`
At the moment, all the tasks using the file module are duplicated to have differents ownerships depending on the fact `is_ceph_infernalis`.
The goal of this commit is to have a new logic for this:
- First set facts depending on the `is_ceph_infernalis` fact
- Create the files or directories using the setted facts as ownerships.
2016-02-05 16:14:01 +01:00
Leseb 115d62d560 Merge pull request #516 from ceph/ansible-v2-warnings
ceph-common: replace 'sudo' by 'become'
2016-02-04 15:31:12 +01:00
Sébastien Han c0a3837d6e ceph-common: replace 'sudo' by 'become'
to avoid warning from ansible v2. works for both `1.9.4` and `2.0.0.2`.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-04 12:36:46 +01:00
Leseb db1cf0e292 Merge pull request #514 from ceph/pkg-install-tags
Adds a package-install tag to all installation tasks
2016-02-03 18:42:39 +01:00
Andrew Schoen df7c8da0e9 Adds a package-install tag to all installation tasks
We have a requirement to install the packages first without
configuration. These tags should allow us to target the tasks need to do
that.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-02-03 11:27:16 -06:00
Leseb b37443dd97 Merge pull request #508 from mattt416/upgrade_flag
Control when ceph packages get updated
2016-02-02 15:16:03 +01:00
Leseb ba544806d3 Merge pull request #511 from ceph/use-pythonuuid
ceph-common: use a generic way to create uuid
2016-02-02 13:28:41 +01:00
Sébastien Han 5ef844988e ceph-common: use a generic way to create uuid
as reported in #510 some systems don't have uuidgen installed so we
better use a more global way to generate it. It sounds like python
should be available in case uuidgen is not.
Otherwise we will have to find another way :)

closes #510

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-02-02 11:24:58 +01:00
Matt Thompson a227a50ab2 Control when ceph packages get updated
Currently, all the ceph package installation resources use
"state=latest", which means subsequent runs of the ceph playbooks
could result in ceph being upgraded if there are package updates
available in the selected repo.

This commit adds a new variable to ceph-common called
'upgrade_ceph_packages' which defaults to False.  This variable is used
in the package installation resources for ceph packages to determine if
the resource should use "state=present" or "state=latest".  If the
variable gets set to True, "state=latest" will be used.

Additionally, we update rolling_update.yml to override
upgrade_ceph_packages to true to permit package upgrades in this
context specifically.

Closes issue #506
2016-02-02 09:56:40 +00:00
Leseb 456e937d1e Merge pull request #493 from ceph/sudo-test
CI does not use root, but sudo will do fine
2016-01-29 16:45:51 +01:00
Sébastien Han 2665c43f34 fix type on ice template
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-01-29 01:15:32 +01:00
Leseb d54d6f9888 Merge pull request #502 from ceph/use-dnf
use dnf when yum is not available
2016-01-29 01:03:04 +01:00
Sébastien Han 17bc64e1ea use dnf when yum is not available
fixes the `importError: No module named yum` see here:
https://jenkins.ceph.com/job/ceph-ansible-pull-requests/45/console

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-01-28 19:11:22 +01:00
Andrew Schoen e6882b8591 remove remote_user from test.yml so it uses the current user
We need this so that the CI tests with jenkins will use the correct
user with sudo access.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-01-28 11:53:23 -06:00
Alfredo Deza f16194b82b create a single-machine inventory for testing
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-01-28 11:53:23 -06:00
Alfredo Deza c3bdf9d5c6 CI does not use root, but sudo will do fine
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-01-28 11:53:23 -06:00
Leseb b1265608ad Merge pull request #501 from ceph/common-defaults
Add defaults for ceph_stable_ice_tmp_path and ceph_stable_ice_kmod
2016-01-28 18:51:42 +01:00
Andrew Schoen 1fc8a17eb0 Add defaults for ceph_stable_ice_tmp_path and ceph_stable_ice_kmod
It seems that in ansible 2.0 even if a task is skipped by it's `when`
clause not evaluating to true the variables in the play are still
rendered. Because these were not defined in defaults/main.yml ansible
was failing in installs/install_on_redhat where those variables are
being used in a `with_items` stanza.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-01-28 11:40:18 -06:00
Leseb a25d1f3692 Merge pull request #500 from ceph/python-pip
Fix pip package name on debian
2016-01-28 15:56:46 +01:00
Sébastien Han f35a665634 Fix pip package name on debian
use python-pip and not pip

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-01-28 15:55:53 +01:00
Leseb 67eaabb6e4 Merge pull request #498 from ceph/fsid-monitor-key
remove unecessary variables
2016-01-28 00:32:22 +01:00
Sébastien Han 21cd46bf8a remove unecessary variables
these variables will be created on the fly, there is no need to force
them.

Signed-off-by: Sébastien Han <seb@redhat.com>
2016-01-27 23:58:51 +01:00
Leseb 065ac72b9f Merge pull request #497 from ceph/vm-kybte
update group_vars/all.sample with min_free_kbytes
2016-01-27 23:30:56 +01:00
Sébastien Han 22d1b26f15 update group_vars/all.sample with min_free_kbytes
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-01-27 23:29:54 +01:00
Leseb 2f0c853d32 Merge pull request #490 from ceph/ansible-2
Necessary change to work on ansible v2
2016-01-25 14:09:26 +01:00
Sébastien Han 64b32020e9 Necessary change to work on ansible v2
Signed-off-by: Sébastien Han <seb@redhat.com>
2016-01-25 11:21:30 +01:00
Leseb e86af15f21 Merge pull request #489 from ceph/vagrant-virtualbox-updates
updates related to using vagrant and virtualbox for testing
2016-01-22 13:18:15 -05:00
Andrew Schoen ec573e6ca2 update the README on using vagrant with virtualbox
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-01-22 11:09:52 -06:00
Andrew Schoen f5bf9d8c57 Include os_tuning_params in the settings used for vagrant testing
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-01-22 11:00:36 -06:00
Andrew Schoen cb308d60a5 adds os_tuning_params to the vagrant_variables.yml.sample file
When using virtualbox with vagrant the default set of os_tuning_params
was locking up my vms. Specifically the vm.vfs_cache_pressure setting.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2016-01-22 10:58:33 -06:00
Leseb eeb2f6ccc5 Merge pull request #488 from PiotrProkop/fix
Adding python-setuptools dependency for CentOS 7.
2016-01-22 11:43:01 -05:00
pprokop cb21e4e3a3 Adding newline 2016-01-22 14:27:36 +01:00