Skip to content

Commit 2de3ed6

Browse files
committed
Automatically define Kolla Ansible tag variables in globals.yml
Use the new kolla-images.py script to automatically define tag variables in globals.yml based on the tags that are defined in kolla_image_tags.
1 parent fde0ec5 commit 2de3ed6

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

etc/kayobe/kolla/globals.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,21 @@ enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts
1010
# This is necessary for os migrations where mixed clouds might be deployed
1111
kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}"
1212

13+
# Convenience variable for base distro and version string.
14+
kolla_base_distro_and_version: "{% raw %}{{ kolla_base_distro }}-{{ kolla_base_distro_version }}{% endraw %}"
15+
1316
# Dict of Kolla image tags to deploy for each service.
1417
# Each key is the tag variable prefix name, and the value is another dict,
1518
# where the key is the OS distro and the value is the tag to deploy.
1619
# NOTE: This is defined in etc/kayobe/kolla-image-tags.yml.
1720
kolla_image_tags:
1821
{{ kolla_image_tags | to_nice_yaml | indent(width=4, first=true) }}
1922

20-
openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}"
21-
bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] }}{% endraw %}"
22-
ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] }}{% endraw %}"
23+
# Variables defining which tag to use for each container's image.
24+
{{ lookup('pipe', 'python3 ' ~ kayobe_config_path ~ '/../../tools/kolla-images.py list-tag-vars') }}
25+
26+
#############################################################################
27+
# RabbitMQ
2328

2429
om_enable_rabbitmq_high_availability: true
2530

0 commit comments

Comments
 (0)