[release] Sync with Kolla Ansible for 2023.2 (partially)

priteau · cityofships · commit 25a49360df99 · 2024-12-06T11:30:12.000+01:00
Change-Id: I5cd9dacea10f0e00b3d481704f0949b6f5c4a69e
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -203,3 +203,6 @@ monitoring
 
 [caso:children]
 monitoring
+
+[letsencrypt:children]
+loadbalancer
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -568,3 +568,9 @@ venus
 
 [venus-manager:children]
 venus
+
+[letsencrypt-webserver:children]
+letsencrypt
+
+[letsencrypt-lego:children]
+letsencrypt
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
@@ -153,6 +153,7 @@ kolla_feature_flags:
   - keystone_federation
   - keystone_horizon_policy_file
   - kuryr
+  - letsencrypt
   - loadbalancer
   - magnum
   - manila
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -351,6 +351,7 @@
 #kolla_enable_keystone_federation:
 #kolla_enable_keystone_horizon_policy_file:
 #kolla_enable_kuryr:
+#kolla_enable_letsencrypt:
 #kolla_enable_loadbalancer:
 #kolla_enable_magnum:
 #kolla_enable_manila:
