2887c6d2e4
If user specifies registry a full image name is constructed by concatenation of the registry, namespace and image. Currently concatenation does not include '/' if registry is non-empty but it should. If registry is empty '/' is not required. This fix covers both use cases with help of Ansible filter. Change-Id: I0588dd0da55d777e6caa7eb47d51b2435d38d5e0 Closes-Bug: #1479013
22 lines
773 B
YAML
22 lines
773 B
YAML
---
|
|
project_name: "mariadb"
|
|
|
|
####################
|
|
# Database
|
|
####################
|
|
database_cluster_name: "kolla"
|
|
|
|
|
|
####################
|
|
# Docker
|
|
####################
|
|
docker_database_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
|
|
docker_database_namespace: "{{ docker_namespace }}"
|
|
kolla_database_base_distro: "{{ kolla_base_distro }}"
|
|
kolla_database_install_type: "{{ kolla_install_type }}"
|
|
kolla_database_container_name: "galera"
|
|
|
|
docker_database_image: "{{ docker_database_registry }}{{ docker_database_namespace }}/{{ kolla_database_base_distro }}-{{ kolla_database_install_type }}-{{ kolla_database_container_name }}"
|
|
docker_database_tag: "{{ openstack_release }}"
|
|
docker_database_image_full: "{{ docker_database_image }}:{{ docker_database_tag }}"
|