Change ansible image to kolla_toolbox

All the images follow the same naming schema where the container
name is part of the ansible variable name.  Currently, the
kolla_toolbox container is named ansible_image_full.  Change
this to match what the container name is.

Could impact operators who are specifying ansible_image_full
in globals.yml.

TrivialFix

Change-Id: I9f0cbe4bd69ce17489310a1f5734a254e6ebe27b
This commit is contained in:
Ryan Hallisey 2016-05-23 09:52:03 -04:00
parent 6d047e5c31
commit f5e0a3959b
3 changed files with 5 additions and 5 deletions

View File

@ -6,9 +6,9 @@ common_run: False
#################### ####################
# Docker # Docker
#################### ####################
ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-toolbox" kolla_toolbox_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-toolbox"
ansible_tag: "{{ openstack_release }}" kolla_toolbox_tag: "{{ openstack_release }}"
ansible_image_full: "{{ ansible_image }}:{{ ansible_tag }}" kolla_toolbox_image_full: "{{ kolla_toolbox_image }}:{{ kolla_toolbox_tag }}"
heka_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heka" heka_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heka"
heka_tag: "{{ openstack_release }}" heka_tag: "{{ openstack_release }}"

View File

@ -3,7 +3,7 @@
kolla_docker: kolla_docker:
action: "pull_image" action: "pull_image"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
image: "{{ ansible_image_full }}" image: "{{ kolla_toolbox_image_full }}"
- name: Pulling heka image - name: Pulling heka image
kolla_docker: kolla_docker:

View File

@ -22,7 +22,7 @@
environment: environment:
ANSIBLE_NOCOLOR: "1" ANSIBLE_NOCOLOR: "1"
ANSIBLE_LIBRARY: "/usr/share/ansible" ANSIBLE_LIBRARY: "/usr/share/ansible"
image: "{{ ansible_image_full }}" image: "{{ kolla_toolbox_image_full }}"
name: "kolla_toolbox" name: "kolla_toolbox"
privileged: True privileged: True
volumes: volumes: