From cc31279b05b62038c735e2f5668d27ff7dedb092 Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Fri, 4 May 2018 13:18:11 +0000 Subject: [PATCH] Remove kubetoolbox image from common role Since the kolla-kubernetes has been separated, and nowhere to use kubetoolbox, it is safe to remove it from kolla-ansible. Change-Id: I9aa59d45fa04c13944120f1f99af2361551147ad (cherry picked from commit 80ec86f18dec0c67fdb918790e5d91d2e02d63d8) --- ansible/roles/common/defaults/main.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml index 82f6c1d575..ebc0c1d0f2 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -56,9 +56,5 @@ fluentd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_ fluentd_tag: "{{ openstack_release }}" fluentd_image_full: "{{ fluentd_image }}:{{ fluentd_tag }}" -kubetoolbox_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kubetoolbox" -kubetoolbox_tag: "{{ openstack_release }}" -kubetoolbox_image_full: "{{ kubetoolbox_image }}:{{ kubetoolbox_tag }}" - syslog_swift_facility: "local0" syslog_haproxy_facility: "local1"