Merge "Rename kolla_ansible to kolla_toolbox"

39 files changed, 60 insertions, 60 deletions

diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml
index 7cd143a3f..723d54a27 100644
--- a/ansible/roles/ceph/tasks/bootstrap_osds.yml
+++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml
@@ -1,6 +1,6 @@
 ---
 - name: Looking up disks to bootstrap for Ceph
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m find_disks
     -a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP'"
   register: osd_lookup
@@ -12,7 +12,7 @@
     osds_bootstrap: "{{ (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}"
 
 - name: Looking up disks to bootstrap for Ceph
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m find_disks
     -a "partition_name='KOLLA_CEPH_OSD_CACHE_BOOTSTRAP'"
   register: osd_cache_lookup
diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml
index 151a28856..1324fd80e 100644
--- a/ansible/roles/ceph/tasks/start_osds.yml
+++ b/ansible/roles/ceph/tasks/start_osds.yml
@@ -1,6 +1,6 @@
 ---
 - name: Looking up OSDs for Ceph
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m find_disks
     -a "partition_name='KOLLA_CEPH_DATA'"
   register: osd_lookup
diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml
index be7966d56..bf17ab6c3 100644
--- a/ansible/roles/cinder/tasks/bootstrap.yml
+++ b/ansible/roles/cinder/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Cinder database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
@@ -18,7 +18,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Cinder database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
diff --git a/ansible/roles/cinder/tasks/register.yml b/ansible/roles/cinder/tasks/register.yml
index aeb2e937d..31f887cca 100644
--- a/ansible/roles/cinder/tasks/register.yml
+++ b/ansible/roles/cinder/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Cinder service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=cinder
         service_type=volume
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Cinder v2 service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=cinderv2
         service_type=volumev2
@@ -40,7 +40,7 @@
   run_once: True
 
 - name: Creating the Cinder project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user=cinder
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index e3895f118..7cf4384c5 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -6,7 +6,7 @@ common_run: False
 ####################
 # Docker
 ####################
-ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-ansible"
+ansible_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kolla-toolbox"
 ansible_tag: "{{ openstack_release }}"
 ansible_image_full: "{{ ansible_image }}:{{ ansible_tag }}"
 
diff --git a/ansible/roles/common/tasks/pull.yml b/ansible/roles/common/tasks/pull.yml
index 1bd963bb8..c5ebeb621 100644
--- a/ansible/roles/common/tasks/pull.yml
+++ b/ansible/roles/common/tasks/pull.yml
@@ -5,7 +5,7 @@
     common_options: "{{ docker_common_options }}"
     image: "{{ rsyslog_image_full }}"
 
-- name: Pulling kolla-ansible image
+- name: Pulling kolla-toolbox image
   kolla_docker:
     action: "pull_image"
     common_options: "{{ docker_common_options }}"
diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml
index bbe9de2ce..cb36fe2db 100644
--- a/ansible/roles/common/tasks/start.yml
+++ b/ansible/roles/common/tasks/start.yml
@@ -11,7 +11,7 @@
       - "/var/lib/kolla/dev:/dev"
       - "rsyslog:/var/log"
 
-- name: Starting kolla-ansible container
+- name: Starting kolla-toolbox container
   kolla_docker:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
@@ -19,7 +19,7 @@
       ANSIBLE_NOCOLOR: "1"
       ANSIBLE_LIBRARY: "/usr/share/ansible"
     image: "{{ ansible_image_full }}"
-    name: "kolla_ansible"
+    name: "kolla_toolbox"
     privileged: True
     volumes:
       - "/dev/:/dev/"
diff --git a/ansible/roles/common/templates/rsyslog.conf.j2 b/ansible/roles/common/templates/rsyslog.conf.j2
index 280ff5ba9..fd5df492f 100644
--- a/ansible/roles/common/templates/rsyslog.conf.j2
+++ b/ansible/roles/common/templates/rsyslog.conf.j2
@@ -6,8 +6,8 @@ $KLogPermitNonKernelFacility on
 $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 $RepeatedMsgReduction on
 
-$template KollaAnsibleFile,"/var/log/kolla_ansible.log"
-:syslogtag,contains,"ansible" ?KollaAnsibleFile
+$template KollaToolboxFile,"/var/log/kolla_toolbox.log"
+:syslogtag,contains,"toolbox" ?KollaToolboxFile
 
 $template GlanceApiFile,"/var/log/glance/glance_api.log"
 :syslogtag,contains,"glance-api" ?GlanceApiFile
diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml
index 2ac9b696f..800a04e54 100644
--- a/ansible/roles/glance/tasks/bootstrap.yml
+++ b/ansible/roles/glance/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Glance database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
@@ -19,7 +19,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Glance database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
diff --git a/ansible/roles/glance/tasks/check.yml b/ansible/roles/glance/tasks/check.yml
index 73303b2ec..0ce7bf547 100644
--- a/ansible/roles/glance/tasks/check.yml
+++ b/ansible/roles/glance/tasks/check.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Glance sanity checks
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_sanity
     -a "service=glance
         project=service
diff --git a/ansible/roles/glance/tasks/register.yml b/ansible/roles/glance/tasks/register.yml
index f5655e63e..905eba8a0 100644
--- a/ansible/roles/glance/tasks/register.yml
+++ b/ansible/roles/glance/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Glance service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=glance
         service_type=image
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Glance project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user=glance
diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml
index ccf0cc234..fa6fde538 100644
--- a/ansible/roles/heat/tasks/bootstrap.yml
+++ b/ansible/roles/heat/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Heat database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
@@ -18,7 +18,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Heat database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
diff --git a/ansible/roles/heat/tasks/register.yml b/ansible/roles/heat/tasks/register.yml
index 3cd89b94b..d6fd4d71d 100644
--- a/ansible/roles/heat/tasks/register.yml
+++ b/ansible/roles/heat/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Heat service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=heat
         service_type=orchestration
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Heat-cfn service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=heat-cfn
         service_type=orchestration
@@ -40,7 +40,7 @@
   run_once: True
 
 - name: Creating the Heat project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user=heat
diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml
index 4a4b9ee4b..3f7ceca5f 100644
--- a/ansible/roles/ironic/tasks/bootstrap.yml
+++ b/ansible/roles/ironic/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Ironic database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_port='{{ mariadb_port }}'
@@ -19,7 +19,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Ironic database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_port='{{ mariadb_port }}'
diff --git a/ansible/roles/ironic/tasks/register.yml b/ansible/roles/ironic/tasks/register.yml
index 518fa3a49..c1862b1d7 100644
--- a/ansible/roles/ironic/tasks/register.yml
+++ b/ansible/roles/ironic/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Ironic service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=ironic
         service_type=baremetal
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Ironic project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user={{ ironic_keystone_user }}
diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml
index dc1ecd626..1694cdb79 100644
--- a/ansible/roles/keystone/tasks/bootstrap.yml
+++ b/ansible/roles/keystone/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Keystone database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_port='{{ mariadb_port }}'
@@ -19,7 +19,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Keystone database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_port='{{ mariadb_port }}'
diff --git a/ansible/roles/keystone/tasks/check.yml b/ansible/roles/keystone/tasks/check.yml
index 328a5e387..53842721b 100644
--- a/ansible/roles/keystone/tasks/check.yml
+++ b/ansible/roles/keystone/tasks/check.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: Keystone sanity checks
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_sanity
     -a "service=keystone
         project=service
diff --git a/ansible/roles/keystone/tasks/register.yml b/ansible/roles/keystone/tasks/register.yml
index a401624cf..a20d6c422 100644
--- a/ansible/roles/keystone/tasks/register.yml
+++ b/ansible/roles/keystone/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the admin project, user and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=admin
         user=admin
@@ -18,7 +18,7 @@
   run_once: True
 
 - name: Creating the Keystone service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=keystone
         service_type=identity
diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml
index 09bc61961..21a4f9698 100644
--- a/ansible/roles/magnum/tasks/bootstrap.yml
+++ b/ansible/roles/magnum/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Magnum database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
@@ -18,7 +18,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Magnum database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
diff --git a/ansible/roles/magnum/tasks/register.yml b/ansible/roles/magnum/tasks/register.yml
index aff9c38b2..a89a124fb 100644
--- a/ansible/roles/magnum/tasks/register.yml
+++ b/ansible/roles/magnum/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Magnum service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=magnum
         service_type=container
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Magnum project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user=magnum
diff --git a/ansible/roles/mariadb/tasks/register.yml b/ansible/roles/mariadb/tasks/register.yml
index 0aa72d2c3..279e4cb61 100644
--- a/ansible/roles/mariadb/tasks/register.yml
+++ b/ansible/roles/mariadb/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating haproxy mysql user
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}'
         login_port='{{ mariadb_port }}'
diff --git a/ansible/roles/mistral/tasks/bootstrap.yml b/ansible/roles/mistral/tasks/bootstrap.yml
index 112aee3aa..ff659c026 100644
--- a/ansible/roles/mistral/tasks/bootstrap.yml
+++ b/ansible/roles/mistral/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Mistral database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
@@ -19,7 +19,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Mistral database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
diff --git a/ansible/roles/mistral/tasks/register.yml b/ansible/roles/mistral/tasks/register.yml
index fe1059d51..5ffbaf1b5 100644
--- a/ansible/roles/mistral/tasks/register.yml
+++ b/ansible/roles/mistral/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Mistral service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=mistral
         service_type=application_catalog
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Mistral project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user=mistral
diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml
index aafabbbb1..4bd551dcf 100644
--- a/ansible/roles/murano/tasks/bootstrap.yml
+++ b/ansible/roles/murano/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Murano database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
@@ -19,7 +19,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Murano database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
diff --git a/ansible/roles/murano/tasks/register.yml b/ansible/roles/murano/tasks/register.yml
index c1ea88daf..2d99fa083 100644
--- a/ansible/roles/murano/tasks/register.yml
+++ b/ansible/roles/murano/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Murano service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=murano
         service_type=application_catalog
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Murano project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user=murano
diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml
index ba63dc685..9eba99be1 100644
--- a/ansible/roles/neutron/tasks/bootstrap.yml
+++ b/ansible/roles/neutron/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Neutron database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
@@ -18,7 +18,7 @@
     database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Neutron database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml
index 221e3de59..2c2c56be8 100644
--- a/ansible/roles/neutron/tasks/register.yml
+++ b/ansible/roles/neutron/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Neutron service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=neutron
         service_type=network
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Neutron project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user=neutron
diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml
index c9ed43175..4a41ad475 100644
--- a/ansible/roles/nova/tasks/bootstrap.yml
+++ b/ansible/roles/nova/tasks/bootstrap.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating Nova database
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_db
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
@@ -36,7 +36,7 @@
     database_api_created: "{{ (database_api.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
 
 - name: Creating Nova database user and setting permissions
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m mysql_user
     -a "login_host='{{ database_address }}'
         login_user='{{ database_user }}'
diff --git a/ansible/roles/nova/tasks/register.yml b/ansible/roles/nova/tasks/register.yml
index 8a82319f2..43f475d63 100644
--- a/ansible/roles/nova/tasks/register.yml
+++ b/ansible/roles/nova/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Nova service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=nova
         service_type=compute
@@ -21,7 +21,7 @@
 
 
 - name: Creating the Nova project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user=nova
diff --git a/ansible/roles/swift/tasks/register.yml b/ansible/roles/swift/tasks/register.yml
index d2d61dd76..f26156893 100644
--- a/ansible/roles/swift/tasks/register.yml
+++ b/ansible/roles/swift/tasks/register.yml
@@ -1,6 +1,6 @@
 ---
 - name: Creating the Swift service and endpoint
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_service
     -a "service_name=swift
         service_type=object-store
@@ -20,7 +20,7 @@
   run_once: True
 
 - name: Creating the Swift project, user, and role
-  command: docker exec -t kolla_ansible /usr/bin/ansible localhost
+  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
     -m kolla_keystone_user
     -a "project=service
         user={{ swift_keystone_user }}
diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index fe80db693..fe80db693 100644
--- a/docker/kolla-ansible/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
diff --git a/docker/kolla-ansible/ansible.cfg b/docker/kolla-toolbox/ansible.cfg
index c45b65ae1..c45b65ae1 100644
--- a/docker/kolla-ansible/ansible.cfg
+++ b/docker/kolla-toolbox/ansible.cfg
diff --git a/docker/kolla-ansible/find_disks.py b/docker/kolla-toolbox/find_disks.py
index 6ebf2b6a2..6ebf2b6a2 100644
--- a/docker/kolla-ansible/find_disks.py
+++ b/docker/kolla-toolbox/find_disks.py
diff --git a/docker/kolla-ansible/kolla_keystone_service.py b/docker/kolla-toolbox/kolla_keystone_service.py
index 7c03d00e1..7c03d00e1 100644
--- a/docker/kolla-ansible/kolla_keystone_service.py
+++ b/docker/kolla-toolbox/kolla_keystone_service.py
diff --git a/docker/kolla-ansible/kolla_keystone_user.py b/docker/kolla-toolbox/kolla_keystone_user.py
index 2d1a739c5..2d1a739c5 100644
--- a/docker/kolla-ansible/kolla_keystone_user.py
+++ b/docker/kolla-toolbox/kolla_keystone_user.py
diff --git a/docker/kolla-ansible/kolla_sanity.py b/docker/kolla-toolbox/kolla_sanity.py
index 7f4eea9fc..7f4eea9fc 100644
--- a/docker/kolla-ansible/kolla_sanity.py
+++ b/docker/kolla-toolbox/kolla_sanity.py
diff --git a/docker/kolla-ansible/kolla_zookeeper.py b/docker/kolla-toolbox/kolla_zookeeper.py
index d6326f46a..d6326f46a 100644
--- a/docker/kolla-ansible/kolla_zookeeper.py
+++ b/docker/kolla-toolbox/kolla_zookeeper.py
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 04603fc13..446e9b1ae 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -26,7 +26,7 @@ INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
 _PROFILE_OPTS = [
     cfg.ListOpt('infra',
                 default=['ceph', 'data', 'mariadb', 'haproxy',
-                         'keepalived', 'kolla-ansible', 'memcached',
+                         'keepalived', 'kolla-toolbox', 'memcached',
                          'mongodb', 'openvswitch', 'rabbitmq', 'rsyslog'],
                 help='Infra images'),
     cfg.ListOpt('main',
@@ -39,14 +39,14 @@ _PROFILE_OPTS = [
                          'magnum', 'mistral', 'trove,' 'zaqar', 'zookeeper'],
                 help='Aux Images'),
     cfg.ListOpt('default',
-                default=['data', 'kolla-ansible', 'glance', 'haproxy',
+                default=['data', 'kolla-toolbox', 'glance', 'haproxy',
                          'heat', 'horizon', 'keepalived', 'keystone',
                          'memcached', 'mariadb', 'neutron', 'nova',
                          'openvswitch', 'rabbitmq', 'rsyslog'],
                 help='Default images'),
     cfg.ListOpt('gate',
                 default=['ceph', 'cinder', 'glance', 'haproxy', 'heat',
-                         'horizon', 'keepalived', 'keystone', 'kolla-ansible',
+                         'horizon', 'keepalived', 'keystone', 'kolla-toolbox',
                          'mariadb', 'memcached', 'neutron', 'nova',
                          'openvswitch', 'rabbitmq', 'rsyslog'],
                 help='Gate images'),
diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 97d0f42a1..7db71eb3a 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -18,7 +18,7 @@ else
         ironic-{discoverd,conductor,api,pxe} \
         keepalived \
         keystone \
-        kolla_ansible \
+        kolla_toolbox \
         magnum_{api,conductor} \
         manila_{api,share,scheduler} \
         mariadb \