Skip to content

Commit 4e73b88

Browse files
committed
use ceph ingress service vars
Using vars will help in overriding the spec as per the requirement during adoptoin. Also count:1 will create issues as ingress handles both haproxy and keepalived
1 parent da5de2a commit 4e73b88

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

roles/cifmw_cephadm/defaults/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,5 @@ cifmw_cephadm_version: "squid"
149149
cifmw_cephadm_prepare_host: false
150150
cifmw_cephadm_wait_install_retries: 8
151151
cifmw_cephadm_wait_install_delay: 15
152+
cifmw_cephadm_rgw_ingress_service_name: "ingress.rgw.default"
153+
cifmw_cephadm_rgw_ingress_service_id: "rgw.default"

roles/cifmw_cephadm/templates/ceph_rgw.yml.j2

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ spec:
2121
---
2222
{% if _hosts|length > 1 %}
2323
service_type: ingress
24-
service_id: rgw.default
25-
service_name: ingress.rgw.default
26-
placement:
27-
count: 1
24+
service_id: {{ cifmw_cephadm_rgw_ingress_service_id }}
25+
service_name: {{ cifmw_cephadm_rgw_ingress_service_name }}
2826
spec:
2927
backend_service: rgw.rgw
3028
frontend_port: 8080

0 commit comments

Comments
 (0)