From aa9ac3320f050fc90fb8bf695b2d4e86add4df0c Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 23 Mar 2021 14:47:53 +0100
Subject: [PATCH] Add global tag variables for Panko and Skydive
This follows the pattern used in other roles.
Change-Id: Ie5e2ea2cab853b4f389c944863d9d2df542856ad
---
ansible/roles/panko/defaults/main.yml | 4 +++-
ansible/roles/skydive/defaults/main.yml | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ansible/roles/panko/defaults/main.yml b/ansible/roles/panko/defaults/main.yml
index 92cc0fafd7..2d481d2abe 100644
--- a/ansible/roles/panko/defaults/main.yml
+++ b/ansible/roles/panko/defaults/main.yml
@@ -33,8 +33,10 @@ panko_database_mysql_address: "{{ database_address | put_address_in_context('url
# Docker
####################
panko_install_type: "{{ kolla_install_type }}"
+panko_tag: "{{ openstack_tag }}"
+
panko_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ panko_install_type }}-panko-api"
-panko_api_tag: "{{ openstack_tag }}"
+panko_api_tag: "{{ panko_tag }}"
panko_api_image_full: "{{ panko_api_image }}:{{ panko_api_tag }}"
panko_api_dimensions: "{{ default_container_dimensions }}"
diff --git a/ansible/roles/skydive/defaults/main.yml b/ansible/roles/skydive/defaults/main.yml
index bbda2f5993..6f1046038d 100644
--- a/ansible/roles/skydive/defaults/main.yml
+++ b/ansible/roles/skydive/defaults/main.yml
@@ -33,13 +33,15 @@ skydive_services:
# Docker
####################
skydive_install_type: "{{ kolla_install_type }}"
+skydive_tag: "{{ openstack_tag }}"
+
skydive_analyzer_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ skydive_install_type }}-skydive-analyzer"
-skydive_analyzer_tag: "{{ openstack_tag }}"
+skydive_analyzer_tag: "{{ skydive_tag }}"
skydive_analyzer_image_full: "{{ skydive_analyzer_image }}:{{ skydive_analyzer_tag }}"
skydive_admin_tenant_name: "{{ openstack_auth['project_name'] }}"
skydive_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ skydive_install_type }}-skydive-agent"
-skydive_agent_tag: "{{ openstack_tag }}"
+skydive_agent_tag: "{{ skydive_tag }}"
skydive_agent_image_full: "{{ skydive_agent_image }}:{{ skydive_agent_tag }}"
skydive_analyzer_dimensions: "{{ default_container_dimensions }}"
skydive_agent_dimensions: "{{ default_container_dimensions }}"
--
GitLab