From e2f5d75f8db91b6a77cb8329f870cd9085d5d686 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 1 Dec 2023 15:52:47 +0100
Subject: [PATCH] [release] Sync with Kolla Ansible for 2023.2

Change-Id: I5cd9dacea10f0e00b3d481704f0949b6f5c4a69e
---
 .../roles/kolla-ansible/templates/overcloud-components.j2   | 3 +++
 ansible/roles/kolla-ansible/templates/overcloud-services.j2 | 6 ++++++
 ansible/roles/kolla-ansible/vars/main.yml                   | 3 +++
 etc/kayobe/kolla.yml                                        | 3 +++
 4 files changed, 15 insertions(+)

diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index 9fca0ed71..a73e63751 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -181,3 +181,6 @@ control
 
 [venus: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
index b34c1e482..d0d53061d 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -530,3 +530,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
index 9ba194659..14ec5f745 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -145,6 +145,7 @@ kolla_feature_flags:
   - influxdb
   - ironic
   - ironic_neutron_agent
+  - ironic_prometheus_exporter
   - ironic_pxe_uefi
   - iscsid
   - keepalived
@@ -152,6 +153,7 @@ kolla_feature_flags:
   - keystone_federation
   - keystone_horizon_policy_file
   - kuryr
+  - letsencrypt
   - loadbalancer
   - magnum
   - manila
@@ -194,6 +196,7 @@ kolla_feature_flags:
   - nova_ssh
   - octavia
   - octavia_driver_agent
+  - octavia_jobboard
   - opensearch
   - opensearch_dashboards
   - opensearch_dashboards_external
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 86661d72a..c604747a8 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -344,6 +344,7 @@
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
 #kolla_enable_ironic_neutron_agent:
+#kolla_enable_ironic_prometheus_exporter:
 #kolla_enable_ironic_pxe_uefi:
 #kolla_enable_iscsid:
 #kolla_enable_keepalived:
@@ -351,6 +352,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:
@@ -393,6 +395,7 @@
 #kolla_enable_nova_ssh:
 #kolla_enable_octavia:
 #kolla_enable_octavia_driver_agent:
+#kolla_enable_octavia_jobboard:
 #kolla_enable_opensearch:
 #kolla_enable_opensearch_dashboards:
 #kolla_enable_opensearch_dashboards_external: