Skip to content

Commit 47e5015

Browse files
committed
Add basic support for ingress service
1 parent b1c352a commit 47e5015

File tree

4 files changed

+29
-1
lines changed

4 files changed

+29
-1
lines changed

galaxy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace: "stackhpc"
22
name: "cephadm"
3-
version: "1.11.0"
3+
version: "1.12.0"
44
readme: "README.md"
55
authors:
66
- "Michal Nasiadka"

roles/cephadm/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,19 @@ All Ceph hosts must be in the `ceph` group.
8383
rgw_zone: myzone
8484
rgw_frontend_port: 1234
8585
```
86+
* Ingress
87+
* `cephadm_ingress_services`: List of ingress services to deploy. `id` should match the RGW service to which ingress
88+
will point to. `spec` is a service specification required by Cephadm to deploy the ingress (haproxy + keepalived pair).
89+
Example:
90+
```
91+
cephadm_ingress_services:
92+
- id: rgw.myrgw
93+
spec:
94+
frontend_port: 443
95+
monitor_port: 1967
96+
virtual_ip: 10.66.0.1/24
97+
ssl_cert: {example_certificate_chain}
98+
```
8699
Note that adding RGW or other services to an existing deployment requires setting `cephadm_bootstrap` variable to *True*.
87100
88101
* Registry

roles/cephadm/defaults/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ cephadm_osd_devices: []
4040
cephadm_osd_spec: []
4141
# RADOSGW
4242
cephadm_radosgw_services: []
43+
# Ingress
44+
cephadm_ingress_services: []

roles/cephadm/templates/cluster.yml.j2

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ labels:
1818
{% if host in groups.get('rgws', []) %}
1919
- rgw
2020
{% endif %}
21+
{% if host in groups.get('ingress', []) %}
22+
- ingress
23+
{% endif %}
2124
{% if hostvars[host].cephadm_host_labels | length > 0 %}
2225
{{ hostvars[host].cephadm_host_labels }}
2326
{% endif %}
@@ -51,4 +54,14 @@ spec:
5154
{{ service.spec | to_nice_yaml }}
5255
{% endif %}
5356
{% endfor %}
57+
{% if groups.get('ingress', []) | length > 0 %}
58+
{% for service in cephadm_ingress_services %}
59+
---
60+
service_type: ingress
61+
service_id: {{ service.id }}
62+
placement:
63+
label: ingress
64+
spec:
65+
{{ service.spec | to_nice_yaml }}
66+
{% endfor %}
5467
{% endif %}

0 commit comments

Comments
 (0)