Commit Graph
6 Commits
Author SHA1 Message Date
Sébastien Han 93b2448619 ceph: refactor rgw bootstrap
This commit does multiple things:

* remove support for AllNodes where we would deploy one rgw per node on
all the nodes.
* a transition path is implemented in the code so that if someone has an
existing deployment, daemonsets will be removed and replaced by an
deployments.
* when using "instances", each rgw deployed has its own key which makes
Ceph reporting the exact number of rgw running, see:

```
[root@rook-ceph-operator-775cf575c5-bh4sr /]# ceph -s
  cluster:
    id:     611fcf39-0669-4864-9a12-debb35c0397a
    health: HEALTH_OK

  services:
    mon: 3 daemons, quorum a,b,c (age 12h)
    mgr: a(active, since 12h)
    osd: 3 osds: 3 up (since 12h), 3 in (since 12h)
    rgw: 3 daemons active (my.store.a, my.store.b, my.store.c)

  data:
    pools:   6 pools, 600 pgs
    objects: 235 objects, 3.8 KiB
    usage:   3.0 GiB used, 84 GiB / 87 GiB avail
    pgs:     600 active+clean
```

Closes: https://github.com/rook/rook/issues/2474, https://github.com/rook/rook/issues/2957 and https://github.com/rook/rook/issues/3245
Signed-off-by: Sébastien Han <seb@redhat.com>
2019-06-14 17:55:15 +02:00
Travis Nielsen cea5fd8676 Merge pull request #3240 from invidian/nit
Fix inconsistency regarding csv-ceph Makefile target
2019-06-03 07:42:22 -06:00
Mateusz Gozdek 0daca0e647 cluster/olm/ceph/README.md: fix inconsistent references to Makefile target
0fc3775b99 added csv-ceph target to Makefile,
but README.md refers to non-existent 'csv' target. This comment aligns
it.

Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
2019-05-31 11:13:50 +02:00
Mateusz Gozdek fcba12a402 generate-rook-csv.sh: fix printed examples
0fc3775b99 added new Makefile target
'csv-ceph', but printed examples refers to non-existing target 'csv'.

This commit fixes this inconsistency.

Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
2019-05-31 11:08:36 +02:00
Mateusz Gozdek d2c7acd0ff generate-rook-csv.sh: fix DEFAULT_CSV_FILE_NAME
With operator-sdk version 0.8.1, default csv file is created with following message:
'INFO[0000] Created deploy/olm-catalog/ceph/1.0.1/ceph.v1.0.1.clusterserviceversion.yaml'

Without this patch, `mv` in the script fails, as default file does not
exist.

Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
2019-05-30 19:12:12 +02:00
Sébastien Han 0fc3775b99 deployment: OLM integration
Add necessary script to auto-generate a CSV file for OLM.

Signed-off-by: Sébastien Han <seb@redhat.com>
2019-05-16 22:53:30 +02:00