Add ansible variables for ingress annotations for roles consuming
openstack_helm_ingress role
- openstack_helm_barbican
- openstack_helm_cinder
- openstack_helm_glance
- openstack_helm_heat
- openstack_helm_horizon
- openstack_helm_keystone
- openstack_helm_neutron
- openstack_helm_nova
- openstack_helm_placement
- openstack_helm_senlin
Sem-Ver: feature
Change-Id: I0677459422d394e2091e3efb5461b7196ce83c0f
diff --git a/releasenotes/notes/ingress-add-variable-for-annotations-b824db994ead135b.yaml b/releasenotes/notes/ingress-add-variable-for-annotations-b824db994ead135b.yaml
new file mode 100644
index 0000000..9277962
--- /dev/null
+++ b/releasenotes/notes/ingress-add-variable-for-annotations-b824db994ead135b.yaml
@@ -0,0 +1,16 @@
+---
+features:
+ - |
+ Add ansible variables for ingress annotations for roles consuming
+ openstack_helm_ingress role
+
+ - openstack_helm_barbican
+ - openstack_helm_cinder
+ - openstack_helm_glance
+ - openstack_helm_heat
+ - openstack_helm_horizon
+ - openstack_helm_keystone
+ - openstack_helm_neutron
+ - openstack_helm_nova
+ - openstack_helm_placement
+ - openstack_helm_senlin
diff --git a/roles/openstack_helm_barbican/defaults/main.yml b/roles/openstack_helm_barbican/defaults/main.yml
index 149da0c..c752a56 100644
--- a/roles/openstack_helm_barbican/defaults/main.yml
+++ b/roles/openstack_helm_barbican/defaults/main.yml
@@ -59,3 +59,9 @@
openstack_helm_barbican_kek: "{{ undef(hint='You must specify a Barbican key encryption key') }}"
# ]]]
+# .. envvar:: openstack_helm_barbican_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_barbican_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_barbican/tasks/main.yml b/roles/openstack_helm_barbican/tasks/main.yml
index 8c9e59d..e428b35 100644
--- a/roles/openstack_helm_barbican/tasks/main.yml
+++ b/roles/openstack_helm_barbican/tasks/main.yml
@@ -36,3 +36,4 @@
openstack_helm_ingress_endpoint: key_manager
openstack_helm_ingress_service_name: barbican-api
openstack_helm_ingress_service_port: 9311
+ openstack_helm_ingress_annotations: "{{ openstack_helm_barbican_ingress_annotations }}"
diff --git a/roles/openstack_helm_cinder/defaults/main.yml b/roles/openstack_helm_cinder/defaults/main.yml
index c4f55b5..5b661bc 100644
--- a/roles/openstack_helm_cinder/defaults/main.yml
+++ b/roles/openstack_helm_cinder/defaults/main.yml
@@ -53,3 +53,9 @@
openstack_helm_cinder_values: {}
# ]]]
+# .. envvar:: openstack_helm_cinder_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_cinder_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_cinder/tasks/main.yml b/roles/openstack_helm_cinder/tasks/main.yml
index 67fa685..51abc1c 100644
--- a/roles/openstack_helm_cinder/tasks/main.yml
+++ b/roles/openstack_helm_cinder/tasks/main.yml
@@ -36,6 +36,4 @@
openstack_helm_ingress_endpoint: volumev3
openstack_helm_ingress_service_name: cinder-api
openstack_helm_ingress_service_port: 8776
- openstack_helm_ingress_annotations:
- nginx.ingress.kubernetes.io/proxy-body-size: "0"
- nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
+ openstack_helm_ingress_annotations: "{{ _openstack_helm_cinder_ingress_annotations | combine(openstack_helm_cinder_ingress_annotations) }}"
diff --git a/roles/openstack_helm_cinder/vars/main.yml b/roles/openstack_helm_cinder/vars/main.yml
index 2b7fef5..678ab05 100644
--- a/roles/openstack_helm_cinder/vars/main.yml
+++ b/roles/openstack_helm_cinder/vars/main.yml
@@ -59,3 +59,7 @@
ingress_api: false
job_clean: false
service_ingress_api: false
+
+_openstack_helm_cinder_ingress_annotations:
+ nginx.ingress.kubernetes.io/proxy-body-size: "0"
+ nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
diff --git a/roles/openstack_helm_glance/defaults/main.yml b/roles/openstack_helm_glance/defaults/main.yml
index 3b9fcec..331d5f3 100644
--- a/roles/openstack_helm_glance/defaults/main.yml
+++ b/roles/openstack_helm_glance/defaults/main.yml
@@ -59,3 +59,9 @@
openstack_helm_glance_images: []
# ]]]
+# .. envvar:: openstack_helm_glance_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_glance_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_glance/tasks/main.yml b/roles/openstack_helm_glance/tasks/main.yml
index 3ae6604..b722cc7 100644
--- a/roles/openstack_helm_glance/tasks/main.yml
+++ b/roles/openstack_helm_glance/tasks/main.yml
@@ -36,9 +36,7 @@
openstack_helm_ingress_endpoint: image
openstack_helm_ingress_service_name: glance-api
openstack_helm_ingress_service_port: 9292
- openstack_helm_ingress_annotations:
- nginx.ingress.kubernetes.io/proxy-body-size: "0"
- nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
+ openstack_helm_ingress_annotations: "{{ _openstack_helm_glance_ingress_annotations | combine(openstack_helm_glance_ingress_annotations) }}"
- name: Create images
block:
diff --git a/roles/openstack_helm_glance/vars/main.yml b/roles/openstack_helm_glance/vars/main.yml
index 41b8016..5d0b74b 100644
--- a/roles/openstack_helm_glance/vars/main.yml
+++ b/roles/openstack_helm_glance/vars/main.yml
@@ -49,3 +49,7 @@
manifests:
ingress_api: false
service_ingress_api: false
+
+_openstack_helm_glance_ingress_annotations:
+ nginx.ingress.kubernetes.io/proxy-body-size: "0"
+ nginx.ingress.kubernetes.io/proxy-request-buffering: "off"
diff --git a/roles/openstack_helm_heat/defaults/main.yml b/roles/openstack_helm_heat/defaults/main.yml
index 8ec2bab..2941e21 100644
--- a/roles/openstack_helm_heat/defaults/main.yml
+++ b/roles/openstack_helm_heat/defaults/main.yml
@@ -65,3 +65,9 @@
openstack_helm_heat_values: {}
# ]]]
+# .. envvar:: openstack_helm_heat_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_heat_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_heat/tasks/main.yml b/roles/openstack_helm_heat/tasks/main.yml
index 7390441..36cc360 100644
--- a/roles/openstack_helm_heat/tasks/main.yml
+++ b/roles/openstack_helm_heat/tasks/main.yml
@@ -64,6 +64,7 @@
openstack_helm_ingress_endpoint: orchestration
openstack_helm_ingress_service_name: heat-api
openstack_helm_ingress_service_port: 8004
+ openstack_helm_ingress_annotations: "{{ openstack_helm_heat_ingress_annotations }}"
- name: Create Ingress
ansible.builtin.include_role:
@@ -72,3 +73,4 @@
openstack_helm_ingress_endpoint: cloudformation
openstack_helm_ingress_service_name: heat-cfn
openstack_helm_ingress_service_port: 8000
+ openstack_helm_ingress_annotations: "{{ openstack_helm_heat_ingress_annotations }}"
diff --git a/roles/openstack_helm_horizon/defaults/main.yml b/roles/openstack_helm_horizon/defaults/main.yml
index 65e5af6..2faf05b 100644
--- a/roles/openstack_helm_horizon/defaults/main.yml
+++ b/roles/openstack_helm_horizon/defaults/main.yml
@@ -53,3 +53,9 @@
openstack_helm_horizon_values: {}
# ]]]
+# .. envvar:: openstack_helm_horizon_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_horizon_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_horizon/tasks/main.yml b/roles/openstack_helm_horizon/tasks/main.yml
index 2d39a98..cf6ace2 100644
--- a/roles/openstack_helm_horizon/tasks/main.yml
+++ b/roles/openstack_helm_horizon/tasks/main.yml
@@ -36,6 +36,7 @@
openstack_helm_ingress_endpoint: dashboard
openstack_helm_ingress_service_name: horizon-int
openstack_helm_ingress_service_port: 80
+ openstack_helm_ingress_annotations: "{{ openstack_helm_horizon_ingress_annotations }}"
openstack_helm_ingress_paths:
- path: /grafana
pathType: Prefix
diff --git a/roles/openstack_helm_keystone/defaults/main.yml b/roles/openstack_helm_keystone/defaults/main.yml
index 5e9dc46..919050f 100644
--- a/roles/openstack_helm_keystone/defaults/main.yml
+++ b/roles/openstack_helm_keystone/defaults/main.yml
@@ -53,3 +53,9 @@
openstack_helm_keystone_values: {}
# ]]]
+# .. envvar:: openstack_helm_keystone_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_keystone_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_keystone/tasks/main.yml b/roles/openstack_helm_keystone/tasks/main.yml
index 45e2de5..97b313a 100644
--- a/roles/openstack_helm_keystone/tasks/main.yml
+++ b/roles/openstack_helm_keystone/tasks/main.yml
@@ -37,3 +37,4 @@
openstack_helm_ingress_endpoint: identity
openstack_helm_ingress_service_name: keystone-api
openstack_helm_ingress_service_port: 5000
+ openstack_helm_ingress_annotations: "{{ openstack_helm_keystone_ingress_annotations }}"
diff --git a/roles/openstack_helm_neutron/defaults/main.yml b/roles/openstack_helm_neutron/defaults/main.yml
index 8f50663..4ddafe0 100644
--- a/roles/openstack_helm_neutron/defaults/main.yml
+++ b/roles/openstack_helm_neutron/defaults/main.yml
@@ -59,3 +59,9 @@
openstack_helm_neutron_networks: []
# ]]]
+# .. envvar:: openstack_helm_neutron_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_neutron_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_neutron/tasks/main.yml b/roles/openstack_helm_neutron/tasks/main.yml
index 00a061b..d9f470e 100644
--- a/roles/openstack_helm_neutron/tasks/main.yml
+++ b/roles/openstack_helm_neutron/tasks/main.yml
@@ -36,6 +36,7 @@
openstack_helm_ingress_endpoint: network
openstack_helm_ingress_service_name: neutron-server
openstack_helm_ingress_service_port: 9696
+ openstack_helm_ingress_annotations: "{{ openstack_helm_neutron_ingress_annotations }}"
- name: Wait until network service ready
kubernetes.core.k8s_info:
diff --git a/roles/openstack_helm_nova/defaults/main.yml b/roles/openstack_helm_nova/defaults/main.yml
index 47f5bdb..a683ea5 100644
--- a/roles/openstack_helm_nova/defaults/main.yml
+++ b/roles/openstack_helm_nova/defaults/main.yml
@@ -83,3 +83,9 @@
openstack_helm_nova_flavors: []
# ]]]
+# .. envvar:: openstack_helm_nova_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_nova_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_nova/tasks/main.yml b/roles/openstack_helm_nova/tasks/main.yml
index e7e8ff6..37ccca6 100644
--- a/roles/openstack_helm_nova/tasks/main.yml
+++ b/roles/openstack_helm_nova/tasks/main.yml
@@ -101,6 +101,7 @@
openstack_helm_ingress_endpoint: compute
openstack_helm_ingress_service_name: nova-api
openstack_helm_ingress_service_port: 8774
+ openstack_helm_ingress_annotations: "{{ openstack_helm_nova_ingress_annotations }}"
- name: Create Ingress
ansible.builtin.include_role:
@@ -109,6 +110,7 @@
openstack_helm_ingress_endpoint: compute_novnc_proxy
openstack_helm_ingress_service_name: nova-novncproxy
openstack_helm_ingress_service_port: 6080
+ openstack_helm_ingress_annotations: "{{ openstack_helm_nova_ingress_annotations }}"
- name: Wait until compute api service ready
kubernetes.core.k8s_info:
diff --git a/roles/openstack_helm_placement/defaults/main.yml b/roles/openstack_helm_placement/defaults/main.yml
index e7c219c..f6f6c5a 100644
--- a/roles/openstack_helm_placement/defaults/main.yml
+++ b/roles/openstack_helm_placement/defaults/main.yml
@@ -53,3 +53,9 @@
openstack_helm_placement_values: {}
# ]]]
+# .. envvar:: openstack_helm_placement_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_placement_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_placement/tasks/main.yml b/roles/openstack_helm_placement/tasks/main.yml
index 6c39459..9bd589a 100644
--- a/roles/openstack_helm_placement/tasks/main.yml
+++ b/roles/openstack_helm_placement/tasks/main.yml
@@ -36,3 +36,4 @@
openstack_helm_ingress_endpoint: placement
openstack_helm_ingress_service_name: placement-api
openstack_helm_ingress_service_port: 8778
+ openstack_helm_ingress_annotations: "{{ openstack_helm_placement_ingress_annotations }}"
diff --git a/roles/openstack_helm_senlin/defaults/main.yml b/roles/openstack_helm_senlin/defaults/main.yml
index 0ab813b..bfe689b 100644
--- a/roles/openstack_helm_senlin/defaults/main.yml
+++ b/roles/openstack_helm_senlin/defaults/main.yml
@@ -65,3 +65,9 @@
openstack_helm_senlin_values: {}
# ]]]
+# .. envvar:: openstack_helm_senlin_ingress_annotations [[[
+#
+# Ingress annotations
+openstack_helm_senlin_ingress_annotations: {}
+
+ # ]]]
diff --git a/roles/openstack_helm_senlin/tasks/main.yml b/roles/openstack_helm_senlin/tasks/main.yml
index 073bb7c..c1f1736 100644
--- a/roles/openstack_helm_senlin/tasks/main.yml
+++ b/roles/openstack_helm_senlin/tasks/main.yml
@@ -66,3 +66,4 @@
openstack_helm_ingress_endpoint: clustering
openstack_helm_ingress_service_name: senlin-api
openstack_helm_ingress_service_port: 8778
+ openstack_helm_ingress_annotations: "{{ openstack_helm_senlin_ingress_annotations }}"