Merge "Rename kolla_ansible to kolla_toolbox"

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

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

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 }}'

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

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 }}"
 

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 }}"

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/"

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

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 }}'

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

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

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 }}'

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

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 }}'

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 }}

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 }}'

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

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

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 }}'

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

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 }}'

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 }}'

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

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 }}'

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

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 }}'

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

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 }}'

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

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 }}

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'),

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 \