aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2025-02-05 09:55:48 +0000
committerGerrit Code Review <review@openstack.org>2025-02-05 09:55:48 +0000
commit7531de2133e05b03c3470ce4e2c372947d9240af (patch)
treed68d5ccc0a196b317ca3c2d4d441b108b7192529
parent9cb2e0db8965b35ff0dc872c5bd1ffe7d5124c0f (diff)
parent99b680019045fe290cd423898f20718e3708886f (diff)
downloadkolla-ansible-7531de2133e05b03c3470ce4e2c372947d9240af.tar.gz
kolla-ansible-7531de2133e05b03c3470ce4e2c372947d9240af.zip
Merge "CI: IPV6 - Enable Prometheus in IPV6 scenario"
-rw-r--r--tests/templates/globals-default.j25
-rw-r--r--zuul.d/base.yaml1
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 35ca0b6fd..5cda23e97 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -107,6 +107,11 @@ enable_cinder_backend_lvm: "yes"
enable_swift: "yes"
{% endif %}
+{% if scenario == "ipv6" %}
+enable_prometheus: "yes"
+enable_prometheus_openstack_exporter: "no"
+{% endif %}
+
{% if scenario == "scenario_nfv" %}
enable_tacker: "yes"
enable_neutron_sfc: "yes"
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 7c50b1d65..bac79f8ab 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -108,6 +108,7 @@
neutron_tenant_network_prefix_length: "64"
neutron_tenant_network_dns_server: 2001:4860:4860::8888
address_family: 'ipv6'
+ scenario: ipv6
- job:
name: kolla-ansible-bifrost-base