Merge pull request #76 from stackhpc/ingress

Add basic support for ingress service

Author: cityofships

galaxy.yml

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

roles/cephadm/README.md

@@ -83,6 +83,20 @@ All Ceph hosts must be in the `ceph` group.
                 rgw_zone: myzone
                 rgw_frontend_port: 1234
       ```
+  * Ingress
+    * `cephadm_ingress_services`: List of ingress services to deploy. `id` should match name (not id) of the RGW service to
+      which ingress will point to. `spec` is a service specification required by Cephadm to deploy the ingress (haproxy +
+      keepalived pair).
+      Example:
+      ```
+          cephadm_ingress_services:
+            - id: rgw.myrgw
+              spec:
+                frontend_port: 443
+                monitor_port: 1967
+                virtual_ip: 10.66.0.1/24
+                ssl_cert: {example_certificate_chain}
+      ```
       Note that adding RGW or other services to an existing deployment requires setting `cephadm_bootstrap` variable to *True*.
 
 * Registry

roles/cephadm/defaults/main.yml

@@ -40,3 +40,5 @@ cephadm_osd_devices: []
 cephadm_osd_spec: []
 # RADOSGW
 cephadm_radosgw_services: []
+# Ingress
+cephadm_ingress_services: []

roles/cephadm/templates/cluster.yml.j2

@@ -18,6 +18,9 @@ labels:
 {% if host in groups.get('rgws', []) %}
   - rgw
 {% endif %}
+{% if host in groups.get('ingress', []) %}
+  - ingress
+{% endif %}
 {% if hostvars[host].cephadm_host_labels | length > 0 %}
 {{ hostvars[host].cephadm_host_labels }}
 {% endif %}
@@ -51,4 +54,14 @@ spec:
   {{ service.spec | to_nice_yaml }}
 {% endif %}
 {% endfor %}
+{% if groups.get('ingress', []) | length > 0 %}
+{% for service in cephadm_ingress_services %}
+---
+service_type: ingress
+service_id: {{ service.id }}
+placement:
+  label: ingress
+spec:
+  {{ service.spec | to_nice_yaml }}
+{% endfor %}
 {% endif %}