openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add global tag variables for Panko and Skydive"

Browse Source
This commit is contained in:
Zuul 2021-04-26 07:43:38 +00:00 committed by Gerrit Code Review
commit 2be34edb93
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/panko/defaults/main.yml
View File

@ -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 }}"

6
ansible/roles/skydive/defaults/main.yml
View File

@ -35,13 +35,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 }}"