]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/log
ceph-ansible.git
10 years agoFix pip module invocation
Sébastien Han [Mon, 27 Jul 2015 15:41:58 +0000 (17:41 +0200)]
Fix pip module invocation

Signed-off-by: Sébastien Han <seb@redhat.com>
10 years agoMerge pull request #341 from ceph/contrib-note
Leseb [Sat, 25 Jul 2015 09:12:18 +0000 (11:12 +0200)]
Merge pull request #341 from ceph/contrib-note

Add contribution note

10 years agoAdd contribution note 341/head
leseb [Sat, 25 Jul 2015 09:10:39 +0000 (11:10 +0200)]
Add contribution note

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #340 from ceph/add-readmes
Leseb [Sat, 25 Jul 2015 08:55:04 +0000 (10:55 +0200)]
Merge pull request #340 from ceph/add-readmes

Add READMEs for each roles

10 years agoAdd READMEs for each roles 340/head
leseb [Sat, 25 Jul 2015 08:40:00 +0000 (10:40 +0200)]
Add READMEs for each roles

Galaxy here we are!

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #334 from lyandrew/master
Leseb [Sat, 25 Jul 2015 07:23:41 +0000 (09:23 +0200)]
Merge pull request #334 from lyandrew/master

Create fetch directory if it doesn't exist.

10 years agoCreate a local fetch directory if it doesn't exist 334/head
Andrew F. Ly [Sat, 25 Jul 2015 03:10:39 +0000 (22:10 -0500)]
Create a local fetch directory if it doesn't exist

10 years agoMerge pull request #339 from ceph/fix-split
Leseb [Fri, 24 Jul 2015 17:17:20 +0000 (19:17 +0200)]
Merge pull request #339 from ceph/fix-split

Fix the branch update

10 years agoFix the branch update 339/head
leseb [Fri, 24 Jul 2015 17:13:14 +0000 (19:13 +0200)]
Fix the branch update

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #337 from ceph/split-repo 338/head
Leseb [Fri, 24 Jul 2015 16:28:05 +0000 (18:28 +0200)]
Merge pull request #337 from ceph/split-repo

Modify the repo to host reoles on the galaxy

10 years agoModify the repo to host reoles on the galaxy 337/head
leseb [Fri, 24 Jul 2015 16:14:59 +0000 (18:14 +0200)]
Modify the repo to host reoles on the galaxy

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #336 from ceph/re-arrange-dir
Leseb [Fri, 24 Jul 2015 14:25:42 +0000 (16:25 +0200)]
Merge pull request #336 from ceph/re-arrange-dir

Re-arrange roles

10 years agoRe-arrange roles 336/head
leseb [Thu, 23 Jul 2015 18:01:43 +0000 (20:01 +0200)]
Re-arrange roles

Trying to add more clarity in the role's task structure.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #335 from ceph/ceph-version-return-code
Leseb [Fri, 24 Jul 2015 10:39:10 +0000 (12:39 +0200)]
Merge pull request #335 from ceph/ceph-version-return-code

Fix ceph version return code issue

10 years agoFix ceph version return code issue 335/head
leseb [Fri, 24 Jul 2015 10:36:45 +0000 (12:36 +0200)]
Fix ceph version return code issue

fixes: #258

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #332 from ceph/galaxy
Leseb [Thu, 23 Jul 2015 11:24:31 +0000 (13:24 +0200)]
Merge pull request #332 from ceph/galaxy

First steps to Ansible Galaxy

10 years agoFirst steps to Ansible Galaxy 332/head
leseb [Thu, 23 Jul 2015 09:36:13 +0000 (11:36 +0200)]
First steps to Ansible Galaxy

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #331 from ceph/add-primary-aff
Leseb [Mon, 20 Jul 2015 13:00:18 +0000 (15:00 +0200)]
Merge pull request #331 from ceph/add-primary-aff

Add primary affinity option

10 years agoAdd primary affinity option 331/head
leseb [Mon, 20 Jul 2015 12:48:58 +0000 (14:48 +0200)]
Add primary affinity option

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #330 from ceph/vagrant-clean
Leseb [Fri, 17 Jul 2015 17:00:00 +0000 (19:00 +0200)]
Merge pull request #330 from ceph/vagrant-clean

Do not track fetch directory

10 years agoDo not track fetch directory 330/head
leseb [Fri, 17 Jul 2015 16:08:24 +0000 (18:08 +0200)]
Do not track fetch directory

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #328 from ceph/group-vars
Leseb [Fri, 17 Jul 2015 13:32:04 +0000 (15:32 +0200)]
Merge pull request #328 from ceph/group-vars

Do not track group_vars files

10 years agoMerge pull request #329 from ceph/fix-mon-gen-key
Leseb [Fri, 17 Jul 2015 13:29:51 +0000 (15:29 +0200)]
Merge pull request #329 from ceph/fix-mon-gen-key

Fix monitor key generation

10 years agoFix monitor key generation 329/head
leseb [Fri, 17 Jul 2015 13:26:38 +0000 (15:26 +0200)]
Fix monitor key generation

Signed-off-by: leseb <seb@redhat.com>
10 years agoDo not track group_vars files 328/head
leseb [Fri, 17 Jul 2015 12:42:16 +0000 (14:42 +0200)]
Do not track group_vars files

While deploying it's a bit annoying to have these files tracked by git.
If we want to closely work with the upstream version it will be easier.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #327 from ceph/generate-monkey
Leseb [Fri, 17 Jul 2015 12:36:56 +0000 (14:36 +0200)]
Merge pull request #327 from ceph/generate-monkey

Generate initial monitor key dynamically

10 years agoDo not change while checking 327/head
leseb [Fri, 17 Jul 2015 12:06:25 +0000 (14:06 +0200)]
Do not change while checking

Signed-off-by: leseb <seb@redhat.com>
10 years agoGenerate initial monitor key dynamically
leseb [Thu, 16 Jul 2015 16:42:12 +0000 (18:42 +0200)]
Generate initial monitor key dynamically

Cool stuff :). We don't need to specify an initial monitor key anymore.
A key will automatically be generated.

The default key can always be overriden with the `monitor_secret`
variable.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #326 from ceph/bare-metal-video
Leseb [Wed, 8 Jul 2015 14:21:30 +0000 (16:21 +0200)]
Merge pull request #326 from ceph/bare-metal-video

Add bare metal video

10 years agoAdd bare metal video 326/head
leseb [Wed, 8 Jul 2015 14:20:30 +0000 (16:20 +0200)]
Add bare metal video

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #325 from ceph/img-format
Leseb [Wed, 8 Jul 2015 12:31:49 +0000 (14:31 +0200)]
Merge pull request #325 from ceph/img-format

Add support for image format

10 years agoAdd support for image format 325/head
leseb [Wed, 8 Jul 2015 12:21:16 +0000 (14:21 +0200)]
Add support for image format

By default, we want to use format 2.
This closely works with rbd features as well.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #324 from ceph/improve-purge
Leseb [Wed, 8 Jul 2015 09:21:19 +0000 (11:21 +0200)]
Merge pull request #324 from ceph/improve-purge

Improve purge playbook

10 years agoFix variable 324/head
leseb [Wed, 8 Jul 2015 09:17:27 +0000 (11:17 +0200)]
Fix variable

Should have looked at Travis this time...

Signed-off-by: leseb <seb@redhat.com>
10 years agoImprove purge playbook
leseb [Wed, 8 Jul 2015 08:34:16 +0000 (10:34 +0200)]
Improve purge playbook

We run a zap twice here since we can't combine with_items and
with_sequence yet. This will land in Ansible 2.0. We destroy all the
partitions and re-create new labels as well. We do this twice just
because sometimes one is not sufficient. We also call partprobe to make
sure that the kernel sees the changes.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #323 from ceph/reuse-public-eth
Leseb [Tue, 7 Jul 2015 16:21:44 +0000 (18:21 +0200)]
Merge pull request #323 from ceph/reuse-public-eth

Re-use public network for private network

10 years agoRe-use public network for private network 323/head
leseb [Tue, 7 Jul 2015 16:18:47 +0000 (18:18 +0200)]
Re-use public network for private network

We don't always have a dedicated cluster network so we can by default
re-use the public network value.
This is just laziness :).

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #322 from ceph/activate-rgw-rhel
Leseb [Tue, 7 Jul 2015 15:56:13 +0000 (17:56 +0200)]
Merge pull request #322 from ceph/activate-rgw-rhel

Activate rgw rhel

10 years agoDisable monitors complain about low pgs per osd 322/head
leseb [Tue, 7 Jul 2015 15:55:05 +0000 (17:55 +0200)]
Disable monitors complain about low pgs per osd

Also add a bunch of option that weren't activated before...

Signed-off-by: leseb <seb@redhat.com>
10 years agoActivate rgws on rhel7
leseb [Tue, 7 Jul 2015 11:48:37 +0000 (13:48 +0200)]
Activate rgws on rhel7

Signed-off-by: leseb <seb@redhat.com>
10 years agoActivate rados gateway with systemd
leseb [Tue, 7 Jul 2015 09:19:50 +0000 (11:19 +0200)]
Activate rados gateway with systemd

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #321 from ceph/do-not-use-latest
Leseb [Tue, 7 Jul 2015 08:41:11 +0000 (10:41 +0200)]
Merge pull request #321 from ceph/do-not-use-latest

Do not use latest package

10 years agoDo not use latest package 321/head
leseb [Tue, 7 Jul 2015 08:39:05 +0000 (10:39 +0200)]
Do not use latest package

While re-running the playbook we do not want to check for new packages.
We shouldn't perform upgrades, we leave this to the operators.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #320 from ceph/rework-zap-disk
Leseb [Mon, 6 Jul 2015 17:11:40 +0000 (19:11 +0200)]
Merge pull request #320 from ceph/rework-zap-disk

Make zap option more secure

10 years agoMake zap option more secure 320/head
leseb [Mon, 6 Jul 2015 16:53:31 +0000 (18:53 +0200)]
Make zap option more secure

Prior to this change, the zap was executed during every play, this was
not ideal. Now we do check if there is a 'ceph' partition. If so we skip
the zap.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #319 from ceph/ignore-errors
Leseb [Mon, 6 Jul 2015 16:33:38 +0000 (18:33 +0200)]
Merge pull request #319 from ceph/ignore-errors

Ignore errors

10 years agoIgnore errors 319/head
leseb [Mon, 6 Jul 2015 16:22:01 +0000 (18:22 +0200)]
Ignore errors

If we don't ignore errors here, the node will get skipped for the rest
of the playbook...

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #318 from ceph/repo-changed-when
Leseb [Mon, 6 Jul 2015 15:50:26 +0000 (17:50 +0200)]
Merge pull request #318 from ceph/repo-changed-when

Do not change when adding the repo

10 years agoFix a terrible mistake in the ceph.conf template 318/head
leseb [Mon, 6 Jul 2015 15:36:45 +0000 (17:36 +0200)]
Fix a terrible mistake in the ceph.conf template

Feel so bad about this one...
Now it's fixed, the rgw section will be activated once the rgws hosts
are part of the inventory.

Signed-off-by: leseb <seb@redhat.com>
10 years agoSpeed up repository check
leseb [Mon, 6 Jul 2015 15:14:07 +0000 (17:14 +0200)]
Speed up repository check

Even if the subcription command is indempotent it takes around 15/16sec
to get it done. Where with the simple yum check we lower down this to
3sec.

Signed-off-by: leseb <seb@redhat.com>
10 years agoDo not change when adding the repo
leseb [Mon, 6 Jul 2015 15:03:31 +0000 (17:03 +0200)]
Do not change when adding the repo

Since the command is indempotent we don't need to check if the repo is
enabled as it will likely take twice the time.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #317 from ceph/add-more-options
Leseb [Mon, 6 Jul 2015 12:00:06 +0000 (14:00 +0200)]
Merge pull request #317 from ceph/add-more-options

Add more client options

10 years agoAdd more client options 317/head
leseb [Mon, 6 Jul 2015 11:58:08 +0000 (13:58 +0200)]
Add more client options

Add `rbd_default_features` and `rbd_default_map_options`.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #315 from ceph/check-vars
Leseb [Sat, 4 Jul 2015 18:51:09 +0000 (20:51 +0200)]
Merge pull request #315 from ceph/check-vars

Use more variable check

10 years agoUse more variable check 315/head
leseb [Fri, 3 Jul 2015 18:18:41 +0000 (20:18 +0200)]
Use more variable check

Fail early if a variable is not defined.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #313 from ceph/change-default-options
Leseb [Fri, 3 Jul 2015 16:48:58 +0000 (18:48 +0200)]
Merge pull request #313 from ceph/change-default-options

Change default options

10 years agoMerge pull request #314 from ceph/fix-iso-fetch
Leseb [Fri, 3 Jul 2015 16:48:33 +0000 (18:48 +0200)]
Merge pull request #314 from ceph/fix-iso-fetch

Fix iso fetch

10 years agoFix restapi invocation 314/head
leseb [Fri, 3 Jul 2015 16:46:57 +0000 (18:46 +0200)]
Fix restapi invocation

Hopefully for good this time...

Signed-off-by: leseb <seb@redhat.com>
10 years agoFix the method used
leseb [Fri, 3 Jul 2015 16:43:04 +0000 (18:43 +0200)]
Fix the method used

We need to collect the iso from the ansible server.

Signed-off-by: leseb <seb@redhat.com>
10 years agoChange default options 313/head
leseb [Fri, 3 Jul 2015 16:38:30 +0000 (18:38 +0200)]
Change default options

We want to force the user to only enable the options they need. Thus
they shouldn't have to enable one option and then disable another.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #312 from ceph/disable-cdn-option
Leseb [Fri, 3 Jul 2015 14:57:51 +0000 (16:57 +0200)]
Merge pull request #312 from ceph/disable-cdn-option

Safer check

10 years agoSafer check 312/head
leseb [Fri, 3 Jul 2015 14:56:34 +0000 (16:56 +0200)]
Safer check

Without this, the subcription manager will run since the default value
for cdn is true...

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #311 from ti-mo/python2-local-action
Leseb [Fri, 3 Jul 2015 14:54:38 +0000 (16:54 +0200)]
Merge pull request #311 from ti-mo/python2-local-action

Use local_action to ensure Ansible executes under python2

10 years agoMerge pull request #310 from ceph/more-repos
Leseb [Fri, 3 Jul 2015 14:36:03 +0000 (16:36 +0200)]
Merge pull request #310 from ceph/more-repos

Add more repo source for stable

10 years agoAdd more repo source for stable 310/head
leseb [Fri, 3 Jul 2015 14:26:21 +0000 (16:26 +0200)]
Add more repo source for stable

Attempt to fix #305

Signed-off-by: leseb <seb@redhat.com>
10 years agoUse local_action to ensure Ansible executes under python2 311/head
Timo Beckers [Fri, 3 Jul 2015 14:25:17 +0000 (16:25 +0200)]
Use local_action to ensure Ansible executes under python2

10 years agoMerge pull request #309 from ceph/restapi-fix
Leseb [Fri, 3 Jul 2015 14:23:10 +0000 (16:23 +0200)]
Merge pull request #309 from ceph/restapi-fix

Only activate restpi when needed

10 years agoOnly activate restpi when needed 309/head
leseb [Fri, 3 Jul 2015 14:22:27 +0000 (16:22 +0200)]
Only activate restpi when needed

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #306 from ceph/cdn-mode-rh-storage
Leseb [Fri, 3 Jul 2015 12:41:32 +0000 (14:41 +0200)]
Merge pull request #306 from ceph/cdn-mode-rh-storage

Add red hat storage cdn installation

10 years agoAdd red hat storage cdn installation 306/head
leseb [Thu, 2 Jul 2015 16:23:11 +0000 (18:23 +0200)]
Add red hat storage cdn installation

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #304 from ceph/cleanup-rgw
Leseb [Thu, 2 Jul 2015 13:32:44 +0000 (15:32 +0200)]
Merge pull request #304 from ceph/cleanup-rgw

Cleanup daemon declaration

10 years agoCleanup daemon declaration 304/head
leseb [Thu, 2 Jul 2015 09:08:59 +0000 (11:08 +0200)]
Cleanup daemon declaration

Now we don't need to activate the services through a variable. If the
role is activated in the inventory, actions will occur automatically.

Fixing the repo creation for red hat storage too.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #303 from ceph/rh-storage-fix
Leseb [Wed, 1 Jul 2015 17:17:29 +0000 (19:17 +0200)]
Merge pull request #303 from ceph/rh-storage-fix

Tiny fix for a variable undeclared

10 years agoTiny fix for a variable undeclared 303/head
leseb [Wed, 1 Jul 2015 17:15:10 +0000 (19:15 +0200)]
Tiny fix for a variable undeclared

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #302 from ceph/rh-storage-1-3
Leseb [Wed, 1 Jul 2015 16:38:02 +0000 (18:38 +0200)]
Merge pull request #302 from ceph/rh-storage-1-3

Add red hat storage support

10 years agoAdd red hat storage support 302/head
leseb [Wed, 1 Jul 2015 13:58:38 +0000 (15:58 +0200)]
Add red hat storage support

The new product version has jsut came out. ICE doesn't exist anymore and
Red Hat Storage is the name of the new product.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #300 from leseb/rgw-start-rhel
Leseb [Tue, 30 Jun 2015 17:20:40 +0000 (19:20 +0200)]
Merge pull request #300 from leseb/rgw-start-rhel

Fixes rgw and mon startup on red hat

10 years agoFixes rgw and mon startup on red hat 300/head
leseb [Tue, 30 Jun 2015 16:43:43 +0000 (18:43 +0200)]
Fixes rgw and mon startup on red hat

closes: #297, #264, #265 and #301

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #299 from leseb/os-tuning-osd-only
Leseb [Tue, 30 Jun 2015 16:13:55 +0000 (18:13 +0200)]
Merge pull request #299 from leseb/os-tuning-osd-only

Only apply os-tuning to OSD nodes

10 years agoOnly apply os-tuning to OSD nodes 299/head
leseb [Tue, 30 Jun 2015 16:13:03 +0000 (18:13 +0200)]
Only apply os-tuning to OSD nodes

There is no need to apply these tuning flags to all the nodes.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #298 from leseb/ceph-mon-handler
Leseb [Tue, 30 Jun 2015 16:10:05 +0000 (18:10 +0200)]
Merge pull request #298 from leseb/ceph-mon-handler

Improve handlers

10 years agoImprove handlers 298/head
leseb [Tue, 30 Jun 2015 16:07:03 +0000 (18:07 +0200)]
Improve handlers

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #295 from leseb/ceph-common-tun-twice
Leseb [Tue, 30 Jun 2015 14:22:31 +0000 (16:22 +0200)]
Merge pull request #295 from leseb/ceph-common-tun-twice

ceph-common was running twice

10 years agoceph-common was running twice 295/head
leseb [Tue, 30 Jun 2015 13:59:30 +0000 (15:59 +0200)]
ceph-common was running twice

Sinxe each Ceph role (except ceph-common) has a dependancy to
ceph-common we don't need to declare ceph-common again.
Prior to this change the ceph-common role was running twice, thing that
wasn't really elegant.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #294 from leseb/vagrant-demo
Leseb [Tue, 30 Jun 2015 11:50:01 +0000 (13:50 +0200)]
Merge pull request #294 from leseb/vagrant-demo

Add vagrant demo video

10 years agoAdd vagrant demo video 294/head
leseb [Tue, 30 Jun 2015 11:48:07 +0000 (13:48 +0200)]
Add vagrant demo video

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #293 from leseb/rest-api-group-vars
Leseb [Tue, 30 Jun 2015 11:46:10 +0000 (13:46 +0200)]
Merge pull request #293 from leseb/rest-api-group-vars

Add group_vars for restapi

10 years agoAdd group_vars for restapi 293/head
leseb [Tue, 30 Jun 2015 11:44:58 +0000 (13:44 +0200)]
Add group_vars for restapi

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #292 from leseb/restapi-container
Leseb [Mon, 29 Jun 2015 12:29:13 +0000 (14:29 +0200)]
Merge pull request #292 from leseb/restapi-container

Add restapi container deployment

10 years agoAdd restapi container deployment 292/head
leseb [Mon, 29 Jun 2015 12:15:07 +0000 (14:15 +0200)]
Add restapi container deployment

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #290 from leseb/bjne-group_names
Leseb [Fri, 26 Jun 2015 13:12:21 +0000 (15:12 +0200)]
Merge pull request #290 from leseb/bjne-group_names

Bjne group names

10 years agoMerge branch 'group_names' of https://github.com/bjne/ceph-ansible into bjne-group_names 290/head
leseb [Fri, 26 Jun 2015 13:10:50 +0000 (15:10 +0200)]
Merge branch 'group_names' of https://github.com/bjne/ceph-ansible into bjne-group_names

Signed-off-by: leseb <seb@redhat.com>
Conflicts:
roles/ceph-common/handlers/main.yml
roles/ceph-mon/tasks/ceph_keys.yml

10 years agoMerge pull request #289 from leseb/cosmetic-again
Leseb [Fri, 26 Jun 2015 12:48:24 +0000 (14:48 +0200)]
Merge pull request #289 from leseb/cosmetic-again

WIP: Cosmetic

10 years agoCosmetic 289/head
leseb [Thu, 25 Jun 2015 22:26:03 +0000 (00:26 +0200)]
Cosmetic

Add more visibility for the 'when' statement.

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #288 from leseb/fix-prepare-logic
Leseb [Thu, 25 Jun 2015 21:52:57 +0000 (23:52 +0200)]
Merge pull request #288 from leseb/fix-prepare-logic

Followup on #287

10 years agoFollowup on #287 288/head
leseb [Thu, 25 Jun 2015 21:40:07 +0000 (23:40 +0200)]
Followup on #287

Signed-off-by: leseb <seb@redhat.com>
10 years agoMerge pull request #287 from bstillwell/master
Leseb [Thu, 25 Jun 2015 21:36:41 +0000 (23:36 +0200)]
Merge pull request #287 from bstillwell/master

Correct the logic for running 'ceph-disk prepare'

10 years agoCorrect the logic for running 'ceph-disk prepare' 287/head
Bryan Stillwell [Thu, 25 Jun 2015 20:29:49 +0000 (14:29 -0600)]
Correct the logic for running 'ceph-disk prepare'

The logic was broken here for repeated runs.  We only want to run
'ceph-disk prepare' when the disk does not contain a ceph partition, is
not a partition, and raw_multi_journal is set.  Previously it would
attempt to run 'ceph-disk prepare' when there was a ceph partition
because the second half of the 'or' was still true since it isn't a
partition.

10 years agoMerge pull request #286 from ceph/deploy-on-docker
Leseb [Thu, 25 Jun 2015 10:24:07 +0000 (12:24 +0200)]
Merge pull request #286 from ceph/deploy-on-docker

Update the Docker bootstrap part

10 years agoUpdate the Docker bootstrap part 286/head
Sébastien Han [Wed, 24 Jun 2015 13:51:54 +0000 (15:51 +0200)]
Update the Docker bootstrap part

We now use ceph/daemon as a default container image so reflecting the
change here.

Signed-off-by: Sébastien Han <seb@redhat.com>