From a0f43fde5d6e281c642c7fcdd9fadf90c6023c53 Mon Sep 17 00:00:00 2001 From: "wu.chunyang" Date: Sat, 12 May 2018 10:50:53 +0800 Subject: [PATCH] optimize the freezer tag keep consistent with other projects Change-Id: I3eae5efbc148a87dea44ce1fe727f6314a437e98 --- ansible/roles/freezer/defaults/main.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ansible/roles/freezer/defaults/main.yml b/ansible/roles/freezer/defaults/main.yml index 51e32c4a5d..5112e76df9 100644 --- a/ansible/roles/freezer/defaults/main.yml +++ b/ansible/roles/freezer/defaults/main.yml @@ -27,13 +27,16 @@ freezer_services: #################### # Docker #################### -freezer_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-freezer-api" -freezer_api_tag: "{{ openstack_release }}" -freezer_api_image_full: "{{ freezer_api_image }}:{{ freezer_api_tag }}" -freezer_scheduler_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-freezer-scheduler" -freezer_scheduler_tag: "{{ openstack_release }}" -freezer_scheduler_image_full: "{{ freezer_scheduler_image }}:{{ freezer_scheduler_tag }}" +freezer_install_type: "{{ kolla_install_type }}" +freezer_tag: "{{ openstack_release }}" +freezer_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ freezer_install_type }}-freezer-api" +freezer_api_tag: "{{ freezer_tag }}" +freezer_api_image_full: "{{ freezer_api_image }}:{{ freezer_api_tag }}" + +freezer_scheduler_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ freezer_install_type }}-freezer-scheduler" +freezer_scheduler_tag: "{{ freezer_tag }}" +freezer_scheduler_image_full: "{{ freezer_scheduler_image }}:{{ freezer_scheduler_tag }}" #################### # OpenStack