diff options
| author | Michal Arbet <michal.arbet@ultimum.io> | 2024-07-18 23:22:53 +0200 |
|---|---|---|
| committer | Michal Arbet <michal.arbet@ultimum.io> | 2024-07-19 08:10:45 +0200 |
| commit | ae86e3a0dbef06841de9ed74cd6ef38ca75448b4 (patch) | |
| tree | 5400569a39d3e62d7ea89b6790c2d9c1764e592c /ansible/roles/openvswitch | |
| parent | fc44651d6297b760e5e39bf6635a0cc22e341ce9 (diff) | |
| download | kolla-ansible-ae86e3a0dbef06841de9ed74cd6ef38ca75448b4.tar.gz kolla-ansible-ae86e3a0dbef06841de9ed74cd6ef38ca75448b4.zip | |
Add support for docker_image_name_prefix
The Kolla project supports building images with
user-defined prefixes. However, Kolla-ansible is unable
to use those images for installation.
This patch fixes that issue.
Closes-Bug: #2073541
Change-Id: Ia8140b289aa76fcd584e0e72686e3786215c5a99
Diffstat (limited to 'ansible/roles/openvswitch')
| -rw-r--r-- | ansible/roles/openvswitch/defaults/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/openvswitch/defaults/main.yml b/ansible/roles/openvswitch/defaults/main.yml index f24d73d63..1d0fd1282 100644 --- a/ansible/roles/openvswitch/defaults/main.yml +++ b/ansible/roles/openvswitch/defaults/main.yml @@ -39,11 +39,11 @@ openvswitch_services: #################### openvswitch_tag: "{{ openstack_tag }}" -openvswitch_db_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/openvswitch-db-server" +openvswitch_db_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}openvswitch-db-server" openvswitch_db_tag: "{{ openvswitch_tag }}" openvswitch_db_image_full: "{{ openvswitch_db_image }}:{{ openvswitch_db_tag }}" -openvswitch_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/openvswitch-vswitchd" +openvswitch_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ docker_image_name_prefix }}openvswitch-vswitchd" openvswitch_vswitchd_tag: "{{ openvswitch_tag }}" openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitch_vswitchd_tag }}" |