Merge pull request #68 from stackhpc/rgw

Improve RADOS GW support

Author: cityofships

galaxy.yml

@@ -1,6 +1,6 @@
 namespace: "stackhpc"
 name: "cephadm"
-version: "1.9.0"
+version: "1.10.0"
 readme: "README.md"
 authors:
   - "Michal Nasiadka"

roles/cephadm/README.md

@@ -68,6 +68,21 @@ All Ceph hosts must be in the `ceph` group.
             db_devices:
               model: Dell Express Flash PM1725b 1.6TB SFF
       ```
+  * RGWs
+    * `cephadm_radosgw_services`: List of Rados Gateways services to deploy. `id` is an arbitrary name for the service,
+      `count_per_host` is desired number of RGW services per host. `spec` is optional additional service specification.
+      Previously undocumented `port` variable is no longer supported.
+      Example:
+      ```
+          cephadm_radosgw_services:
+            - id: myrgw
+              count_per_host: 2
+              spec:
+                rgw_realm: myrealm
+                rgw_zone: myzone
+                rgw_frontend_port: 1234
+      ```
+      Note that adding RGW or other services to an existing deployment requires setting `cephadm_bootstrap` variable to *True*.
 
 * Registry
     * `cephadm_registry_url`: (default: not used)

roles/cephadm/templates/cluster.yml.j2

@@ -5,29 +5,29 @@ hostname: {{ hostvars[host].ansible_facts.hostname }}
 addr: {{ hostvars[host].ansible_facts[cephadm_admin_interface]['ipv4']['address'] }}
 labels:
 {% if host in groups['mons'] %}
-- _admin
-- mon
+  - _admin
+  - mon
 {% endif %}
 {% if host in groups['mgrs'] %}
-- mgr
+  - mgr
 {% endif %}
 {% if host in groups['osds'] %}
-- osd
+  - osd
 {% endif %}
 {% if host in groups.get('rgws', []) %}
-- rgw
+  - rgw
 {% endif %}
 {% endfor %}
 ---
 service_type: mon
 placement:
   count: {{ cephadm_mon_count }}
-  label: "mon"
+  label: mon
 ---
 service_type: mgr
 placement:
   count: {{ cephadm_mgr_count }}
-  label: "mgr"
+  label: mgr
 ---
 service_type: crash
 placement:
@@ -38,9 +38,13 @@ placement:
 service_type: rgw
 service_id: {{ service.id }}
 placement:
-  label: "rgw"
-{% if service.port is defined %}
-rgw_frontend_port: {{ service.port }}
+  label: rgw
+{% if service.count_per_host is defined %}
+  count_per_host: {{ service.count_per_host }}
+{% endif %}
+{% if service.spec is defined %}
+spec:
+  {{ service.spec | to_nice_yaml }}
 {% endif %}
 {% endfor %}
 {% endif %}