Mixing binary and source images for Glance

In case Kolla's users want to deploy with both of
binary and source image, we should have a variable
install type that define install type for each project.

We also add specific image tag for each Openstack project.

Change-Id: I07af4fe56e00b7d0bbf1d5216b0a508806f04d7d
Implements: blueprint mixing-binary-and-source-image
This commit is contained in:
Dai Dang Van 2017-04-27 15:04:42 +07:00
parent a910be91f5
commit 5a935cc251

View File

@ -47,12 +47,15 @@ glance_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
####################
# Docker
####################
glance_registry_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-glance-registry"
glance_registry_tag: "{{ openstack_release }}"
glance_install_type: "{{ kolla_install_type }}"
glance_tag: "{{ openstack_release }}"
glance_registry_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ glance_install_type }}-glance-registry"
glance_registry_tag: "{{ glance_tag }}"
glance_registry_image_full: "{{ glance_registry_image }}:{{ glance_registry_tag }}"
glance_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-glance-api"
glance_api_tag: "{{ openstack_release }}"
glance_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ glance_install_type }}-glance-api"
glance_api_tag: "{{ glance_tag }}"
glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}"