openstack/kolla-ansible
Code Issues Proposed changes

Merge "Mixing binary and source images for Glance"

Browse Source
This commit is contained in:
Jenkins 2017-06-06 01:16:49 +00:00 committed by Gerrit Code Review
commit 28e4ae81cf
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/roles/glance/defaults/main.yml
View File

@ -47,12 +47,15 @@ glance_database_address: "{{ kolla_internal_fqdn }}:{{ database_port }}"
#################### ####################
# Docker # Docker
#################### ####################
glance_registry_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-glance-registry" glance_install_type: "{{ kolla_install_type }}"
glance_registry_tag: "{{ openstack_release }}" 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_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_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ glance_install_type }}-glance-api"
glance_api_tag: "{{ openstack_release }}" glance_api_tag: "{{ glance_tag }}"
glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}" glance_api_image_full: "{{ glance_api_image }}:{{ glance_api_tag }}"
#################### ####################