aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-06 05:44:35 +0000
committerGerrit Code Review <review@openstack.org>2016-01-06 05:44:35 +0000
commitcdcd0ecc4771f4feb797c3f17e59875a385ed626 (patch)
tree8045cc628348d2f576b9aa9de39b4840ca5e9942
parenteda2b56e3c20590e9fd669ea63d3b9f88c3cad2c (diff)
parent78f442a6becb3bd6bb62c69a3570e438aea525ab (diff)
downloadkolla-cdcd0ecc4771f4feb797c3f17e59875a385ed626.tar.gz
kolla-cdcd0ecc4771f4feb797c3f17e59875a385ed626.zip
Merge "Remove unused heat_registry_* variables"
-rw-r--r--ansible/roles/heat/defaults/main.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/ansible/roles/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml
index 1e126a7b2..de9d644a8 100644
--- a/ansible/roles/heat/defaults/main.yml
+++ b/ansible/roles/heat/defaults/main.yml
@@ -12,10 +12,6 @@ heat_database_address: "{{ kolla_internal_address }}"
####################
# Docker
####################
-heat_registry_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heat-registry"
-heat_registry_tag: "{{ openstack_release }}"
-heat_registry_image_full: "{{ heat_registry_image }}:{{ heat_registry_tag }}"
-
heat_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-heat-api"
heat_api_tag: "{{ openstack_release }}"
heat_api_image_full: "{{ heat_api_image }}:{{ heat_api_tag }}"