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
28 lines
1.3 KiB
YAML
Executable File
28 lines
1.3 KiB
YAML
Executable File
---
|
|
project_name: "haproxy"
|
|
|
|
|
|
####################
|
|
# Docker
|
|
####################
|
|
docker_haproxy_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
|
|
docker_haproxy_namespace: "{{ docker_namespace }}"
|
|
kolla_haproxy_base_distro: "{{ kolla_base_distro }}"
|
|
kolla_haproxy_install_type: "{{ kolla_install_type }}"
|
|
kolla_haproxy_container_name: "haproxy"
|
|
|
|
docker_haproxy_image: "{{ docker_haproxy_registry }}{{ docker_haproxy_namespace }}/{{ kolla_haproxy_base_distro }}-{{ kolla_haproxy_install_type }}-{{ kolla_haproxy_container_name }}"
|
|
docker_haproxy_tag: "{{ openstack_release }}"
|
|
docker_haproxy_image_full: "{{ docker_haproxy_image }}:{{ docker_haproxy_tag }}"
|
|
|
|
|
|
docker_keepalived_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
|
|
docker_keepalived_namespace: "{{ docker_namespace }}"
|
|
kolla_keepalived_base_distro: "{{ kolla_base_distro }}"
|
|
kolla_keepalived_install_type: "{{ kolla_install_type }}"
|
|
kolla_keepalived_container_name: "keepalived"
|
|
|
|
docker_keepalived_image: "{{ docker_keepalived_registry }}{{ docker_keepalived_namespace }}/{{ kolla_keepalived_base_distro }}-{{ kolla_keepalived_install_type }}-{{ kolla_keepalived_container_name }}"
|
|
docker_keepalived_tag: "{{ openstack_release }}"
|
|
docker_keepalived_image_full: "{{ docker_keepalived_image }}:{{ docker_keepalived_tag }}"
|