chore: refactor to atmosphere_ingress_cluster_issuer
diff --git a/playbooks/openstack.yml b/playbooks/openstack.yml
index 95de1c9..8543a0d 100644
--- a/playbooks/openstack.yml
+++ b/playbooks/openstack.yml
@@ -40,6 +40,10 @@
tags:
- cert-manager
+ - role: cluster_issuer
+ tags:
+ - cluster-issuer
+
- role: ingress_nginx
tags:
- ingress-nginx
diff --git a/roles/atmosphere/vars/main.yml b/roles/atmosphere/vars/main.yml
index f839fa4..2710cb7 100644
--- a/roles/atmosphere/vars/main.yml
+++ b/roles/atmosphere/vars/main.yml
@@ -1,5 +1,5 @@
_atmosphere_cloud_spec:
imageRepository: "{{ atmosphere_image_repository | default(None) }}"
ingressClassName: "{{ atmosphere_ingress_class_name }}"
- certManagerClusterIssuer: "{{ openstack_helm_ingress_cluster_issuer | default('atmosphere') }}"
+ certManagerClusterIssuer: "{{ atmosphere_ingress_cluster_issuer }}"
regionName: "{{ openstack_helm_endpoints_region_name }}"
diff --git a/roles/defaults/defaults/main.yml b/roles/defaults/defaults/main.yml
index bc6551b..ca193fb 100644
--- a/roles/defaults/defaults/main.yml
+++ b/roles/defaults/defaults/main.yml
@@ -1,5 +1,6 @@
# Ingress
atmosphere_ingress_class_name: atmosphere
+atmosphere_ingress_cluster_issuer: atmosphere
atmosphere_images:
alertmanager: quay.io/prometheus/alertmanager:v0.24.0
diff --git a/roles/openstack_helm_ingress/defaults/main.yml b/roles/openstack_helm_ingress/defaults/main.yml
index 1a6e7b2..137c3d4 100644
--- a/roles/openstack_helm_ingress/defaults/main.yml
+++ b/roles/openstack_helm_ingress/defaults/main.yml
@@ -8,7 +8,7 @@
openstack_helm_ingress_host: "{{ openstack_helm_endpoints[openstack_helm_ingress_endpoint]['host_fqdn_override']['public']['host'] }}"
# Name of the "cert-manager" ClusterIssuer to use for TLS certificates
-openstack_helm_ingress_cluster_issuer: atmosphere
+openstack_helm_ingress_cluster_issuer: "{{ atmosphere_ingress_cluster_issuer }}"
# Name of the Ingress class to use for exposing the service.
openstack_helm_ingress_class_name: "{{ atmosphere_ingress_class_name }}"