Merge "Rename kolla_docker to kolla_container"

ansible/library/kolla_container.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # FIXME(yoctozepto): this module does *not* validate "common_options" which are
-# a hacky way to seed most usages of kolla_docker in kolla-ansible ansible
+# a hacky way to seed most usages of kolla_container in kolla-ansible ansible
 # playbooks - caution has to be exerted when setting "common_options"
 
 # FIXME(yoctozepto): restart_policy is *not* checked in the container
@@ -26,7 +26,7 @@ from ansible.module_utils.kolla_container_worker import ContainerWorker
 
 DOCUMENTATION = '''
 ---
-module: kolla_docker
+module: kolla_container
 short_description: Module for controlling containers
 description:
      - A module targeting at controlling container engine as used by Kolla.
@@ -234,31 +234,31 @@ author: Sam Yaple
 '''
 
 EXAMPLES = '''
-- hosts: kolla_docker
+- hosts: kolla_container
   tasks:
     - name: Start container
-      kolla_docker:
+      kolla_container:
         image: ubuntu
         name: test_container
         action: start_container
     - name: Remove container
-      kolla_docker:
+      kolla_container:
         name: test_container
         action: remove_container
     - name: Pull image without starting container
-      kolla_docker:
+      kolla_container:
         action: pull_image
         image: private-registry.example.com:5000/ubuntu
     - name: Create named volume
-      kolla_docker:
+      kolla_container:
         action: create_volume
         name: name_of_volume
     - name: Remove named volume
-      kolla_docker:
+      kolla_container:
         action: remove_volume
         name: name_of_volume
     - name: Remove image
-      kolla_docker:
+      kolla_container:
         action: remove_image
         image: name_of_image
 '''

ansible/module_utils/kolla_systemd_worker.py

@@ -59,7 +59,7 @@ class SystemdWorker(object):
         # NOTE(hinermar): duration * retries should be less than timeout
         # otherwise service will indefinitely try to restart.
         # Also, correct timeout and retries values should probably be
-        # checked at the module level inside kolla_docker.py
+        # checked at the module level inside kolla_container.py
         restart_timeout = params.get('client_timeout', 120)
         restart_retries = params.get('restart_retries', 10)
         restart_duration = (restart_timeout // restart_retries) - 1

ansible/roles/aodh/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "aodh-api"
     service: "{{ aodh_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "aodh-evaluator"
     service: "{{ aodh_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "aodh-listener"
     service: "{{ aodh_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -52,7 +52,7 @@
     service_name: "aodh-notifier"
     service: "{{ aodh_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/aodh/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     aodh_api: "{{ aodh_services['aodh-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/aodh/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check aodh containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/barbican/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "barbican-api"
     service: "{{ barbican_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "barbican-keystone-listener"
     service: "{{ barbican_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "barbican-worker"
     service: "{{ barbican_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/barbican/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     barbican_api: "{{ barbican_services['barbican-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/barbican/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check barbican containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/bifrost/tasks/reconfigure.yml

@@ -1,7 +1,7 @@
 ---
 - name: Ensuring the containers up
   become: true
-  kolla_docker:
+  kolla_container:
     common_options: "{{ docker_common_options }}"
     name: "{{ item.name }}"
     action: "get_container_state"
@@ -28,7 +28,7 @@
 # just remove the container and start again
 - name: Containers config strategy
   become: true
-  kolla_docker:
+  kolla_container:
     common_options: "{{ docker_common_options }}"
     name: "{{ item.name }}"
     action: "get_container_env"
@@ -39,7 +39,7 @@
 
 - name: Remove the containers
   become: true
-  kolla_docker:
+  kolla_container:
     common_options: "{{ docker_common_options }}"
     name: "{{ item[0]['name'] }}"
     action: "remove_container"
@@ -58,7 +58,7 @@
 
 - name: Restart containers
   become: true
-  kolla_docker:
+  kolla_container:
     common_options: "{{ docker_common_options }}"
     name: "{{ item[0]['name'] }}"
     action: "restart_container"

ansible/roles/bifrost/tasks/start.yml

@@ -1,7 +1,7 @@
 ---
 - name: Starting bifrost deploy container
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     image: "{{ bifrost_deploy_image_full }}"

ansible/roles/bifrost/tasks/stop.yml

@@ -22,7 +22,7 @@
 
         - name: Stopping bifrost_deploy container
           become: true
-          kolla_docker:
+          kolla_container:
             action: "stop_container"
             common_options: "{{ docker_common_options }}"
             name: "bifrost_deploy"

ansible/roles/blazar/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "blazar-api"
     service: "{{ blazar_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "blazar-manager"
     service: "{{ blazar_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/blazar/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     blazar_api: "{{ blazar_services['blazar-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/blazar/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check blazar containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/ceilometer/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "ceilometer-notification"
     service: "{{ ceilometer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "ceilometer-central"
     service: "{{ ceilometer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "ceilometer-compute"
     service: "{{ ceilometer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -53,7 +53,7 @@
     service_name: "ceilometer-ipmi"
     service: "{{ ceilometer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/ceilometer/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     ceilometer_notification: "{{ ceilometer_services['ceilometer-notification'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/ceilometer/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check ceilometer containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/cinder/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "cinder-api"
     service: "{{ cinder_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "cinder-scheduler"
     service: "{{ cinder_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "cinder-volume"
     service: "{{ cinder_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -55,7 +55,7 @@
     service_name: "cinder-backup"
     service: "{{ cinder_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/cinder/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     cinder_api: "{{ cinder_services['cinder-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/cinder/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check cinder containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/cinder/tasks/reload.yml

@@ -3,7 +3,7 @@
   vars:
     service: "{{ item.value }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/cinder/tasks/upgrade.yml

@@ -19,7 +19,7 @@
   vars:
     cinder_api: "{{ cinder_services['cinder-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/cloudkitty/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "cloudkitty-api"
     service: "{{ cloudkitty_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "cloudkitty-processor"
     service: "{{ cloudkitty_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/cloudkitty/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     cloudkitty_api: "{{ cloudkitty_services['cloudkitty-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/cloudkitty/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check cloudkitty containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/collectd/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "collectd"
     service: "{{ collectd_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/collectd/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check collectd containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/common/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "fluentd"
     service: "{{ common_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "kolla-toolbox"
     service: "{{ common_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -44,7 +44,7 @@
     service_name: "cron"
     service: "{{ common_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/common/tasks/bootstrap.yml

@@ -1,7 +1,7 @@
 ---
 - name: Creating log volume
   become: true
-  kolla_docker:
+  kolla_container:
     action: "create_volume"
     common_options: "{{ docker_common_options }}"
     name: "kolla_logs"

ansible/roles/common/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check common containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/cyborg/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "cyborg-api"
     service: "{{ cyborg_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -21,7 +21,7 @@
     service_name: "cyborg-conductor"
     service: "{{ cyborg_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -38,7 +38,7 @@
     service_name: "cyborg-agent"
     service: "{{ cyborg_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/cyborg/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     cyborg_api: "{{ cyborg_services['cyborg-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/cyborg/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check cyborg containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/designate/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "designate-backend-bind9"
     service: "{{ designate_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "designate-api"
     service: "{{ designate_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "designate-central"
     service: "{{ designate_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -52,7 +52,7 @@
     service_name: "designate-producer"
     service: "{{ designate_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -68,7 +68,7 @@
     service_name: "designate-mdns"
     service: "{{ designate_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -84,7 +84,7 @@
     service_name: "designate-worker"
     service: "{{ designate_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -100,7 +100,7 @@
     service_name: "designate-sink"
     service: "{{ designate_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/designate/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     designate_central: "{{ designate_services['designate-central'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/designate/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check designate containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/etcd/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "etcd"
     service: "{{ etcd_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/etcd/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check etcd containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/freezer/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "freezer-api"
     service: "{{ freezer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -19,7 +19,7 @@
     service_name: "freezer-scheduler"
     service: "{{ freezer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/freezer/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     freezer_api: "{{ freezer_services['freezer-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/freezer/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check freezer containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/glance/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "glance-api"
     service: "{{ glance_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -22,7 +22,7 @@
     service_name: "glance-tls-proxy"
     service: "{{ glance_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/glance/tasks/bootstrap_service.yml

@@ -20,7 +20,7 @@
   vars:
     glance_api: "{{ glance_services['glance-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/glance/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check glance containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/glance/tasks/rolling_upgrade.yml

@@ -31,7 +31,7 @@
   vars:
     glance_api: "{{ glance_services['glance-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False
@@ -52,7 +52,7 @@
   vars:
     glance_api: "{{ glance_services['glance-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False
@@ -84,7 +84,7 @@
   vars:
     glance_api: "{{ glance_services['glance-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/glance/tasks/stop_service.yml

@@ -3,7 +3,7 @@
   vars:
     glance_api: "{{ glance_services['glance-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "stop_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ glance_api.container_name }}"

ansible/roles/gnocchi/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "gnocchi-api"
     service: "{{ gnocchi_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "gnocchi-metricd"
     service: "{{ gnocchi_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "gnocchi-statsd"
     service: "{{ gnocchi_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/gnocchi/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     gnocchi_api: "{{ gnocchi_services['gnocchi-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/gnocchi/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check gnocchi containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/grafana/handlers/main.yml

@@ -5,7 +5,7 @@
     service_name: "grafana"
     service: "{{ grafana_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -42,7 +42,7 @@
     service_name: "grafana"
     service: "{{ grafana_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/grafana/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check grafana containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/grafana/tasks/upgrade.yml

@@ -4,7 +4,7 @@
     service_name: "grafana"
     service: "{{ grafana_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_image"
     common_options: "{{ docker_common_options }}"
     name: "{{ project_name }}"
@@ -21,7 +21,7 @@
 # is upgraded first, we stop all the other ones.
 - name: Stopping all Grafana instances but the first node
   become: true
-  kolla_docker:
+  kolla_container:
     action: "stop_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ project_name }}"

ansible/roles/hacluster/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "hacluster-corosync"
     service: "{{ hacluster_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -21,7 +21,7 @@
     service_name: "hacluster-pacemaker"
     service: "{{ hacluster_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -38,7 +38,7 @@
     service_name: "hacluster-pacemaker-remote"
     service: "{{ hacluster_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/hacluster/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check hacluster containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/heat/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "heat-api"
     service: "{{ heat_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "heat-api-cfn"
     service: "{{ heat_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "heat-engine"
     service: "{{ heat_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/heat/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     heat_api: "{{ heat_services['heat-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/heat/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check heat containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/horizon/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "horizon"
     service: "{{ horizon_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/horizon/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     horizon: "{{ horizon_services['horizon'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/horizon/tasks/check-containers.yml

@@ -3,7 +3,7 @@
   vars:
     horizon: "{{ horizon_services['horizon'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ horizon.container_name }}"

ansible/roles/influxdb/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "influxdb"
     service: "{{ influxdb_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/influxdb/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check influxdb containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/ironic/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "ironic-conductor"
     service: "{{ ironic_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -21,7 +21,7 @@
     service_name: "ironic-api"
     service: "{{ ironic_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -37,7 +37,7 @@
     service_name: "ironic-inspector"
     service: "{{ ironic_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -54,7 +54,7 @@
     service_name: "ironic-tftp"
     service: "{{ ironic_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -70,7 +70,7 @@
     service_name: "ironic-http"
     service: "{{ ironic_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -86,7 +86,7 @@
     service_name: "ironic-dnsmasq"
     service: "{{ ironic_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -102,7 +102,7 @@
     service_name: "ironic-prometheus-exporter"
     service: "{{ ironic_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/ironic/tasks/bootstrap_service.yml

@@ -9,7 +9,7 @@
       KOLLA_UPGRADE:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False
@@ -28,7 +28,7 @@
   vars:
     ironic_inspector: "{{ ironic_services['ironic-inspector'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False
@@ -49,7 +49,7 @@
   vars:
     ironic_tftp: "{{ ironic_services['ironic-tftp'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/ironic/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check ironic containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/ironic/tasks/rolling_upgrade.yml

@@ -31,7 +31,7 @@
   vars:
     ironic_api: "{{ ironic_services['ironic-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/iscsi/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "iscsid"
     service: "{{ iscsi_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -21,7 +21,7 @@
     service_name: "tgtd"
     service: "{{ iscsi_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/iscsi/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check iscsi containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/keystone/handlers/main.yml

@@ -7,7 +7,7 @@
     service_name: "keystone"
     service: "{{ keystone_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False
@@ -31,7 +31,7 @@
     service_name: "keystone-ssh"
     service: "{{ keystone_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -47,7 +47,7 @@
     service_name: "keystone-fernet"
     service: "{{ keystone_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -63,7 +63,7 @@
     service_name: "keystone"
     service: "{{ keystone_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -79,7 +79,7 @@
     service_name: "keystone"
     service: "{{ keystone_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/keystone/tasks/bootstrap_service.yml

@@ -34,7 +34,7 @@
   vars:
     keystone: "{{ keystone_services.keystone }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False
@@ -53,7 +53,7 @@
   vars:
     keystone_fernet: "{{ keystone_services['keystone-fernet'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/keystone/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check keystone containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/kuryr/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "kuryr"
     service: "{{ kuryr_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/kuryr/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check kuryr containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/letsencrypt/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "letsencrypt-webserver"
     service: "{{ letsencrypt_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -21,7 +21,7 @@
     service_name: "letsencrypt-lego"
     service: "{{ letsencrypt_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/letsencrypt/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check LetsEncrypt containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/letsencrypt/tasks/pull.yml

@@ -1,7 +1,7 @@
 ---
 - name: Pulling LetsEncrypt images
   become: true
-  kolla_docker:
+  kolla_container:
     action: "pull_image"
     common_options: "{{ docker_common_options }}"
     image: "{{ item.value.image }}"

ansible/roles/loadbalancer/handlers/main.yml

@@ -41,7 +41,7 @@
 
 - name: Stop backup keepalived container
   become: true
-  kolla_docker:
+  kolla_container:
     action: "stop_container"
     # NOTE(yoctozepto): backup node might not have keepalived yet - ignore
     ignore_missing: true
@@ -59,7 +59,7 @@
 
 - name: Stop backup haproxy container
   become: true
-  kolla_docker:
+  kolla_container:
     action: "stop_container"
     # NOTE(kevko): backup node might not have haproxy yet - ignore
     ignore_missing: true
@@ -75,7 +75,7 @@
 
 - name: Stop backup proxysql container
   become: true
-  kolla_docker:
+  kolla_container:
     action: "stop_container"
     # NOTE(kevko): backup node might not have proxysql yet - ignore
     ignore_missing: true
@@ -98,7 +98,7 @@
     service_name: "haproxy"
     service: "{{ loadbalancer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -128,7 +128,7 @@
     service_name: "proxysql"
     service: "{{ loadbalancer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -162,7 +162,7 @@
     service_name: "keepalived"
     service: "{{ loadbalancer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -184,7 +184,7 @@
 # to the VIP address.
 - name: Stop master haproxy container
   become: true
-  kolla_docker:
+  kolla_container:
     action: "stop_container"
     # NOTE(yoctozepto): master node might not have haproxy yet - ignore
     ignore_missing: true
@@ -200,7 +200,7 @@
 
 - name: Stop master proxysql container
   become: true
-  kolla_docker:
+  kolla_container:
     action: "stop_container"
     common_options: "{{ docker_common_options }}"
     name: "proxysql"
@@ -215,7 +215,7 @@
 
 - name: Stop master keepalived container
   become: true
-  kolla_docker:
+  kolla_container:
     action: "stop_container"
     common_options: "{{ docker_common_options }}"
     name: "keepalived"
@@ -232,7 +232,7 @@
     service_name: "haproxy"
     service: "{{ loadbalancer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -262,7 +262,7 @@
     service_name: "proxysql"
     service: "{{ loadbalancer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -292,7 +292,7 @@
     service_name: "keepalived"
     service: "{{ loadbalancer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -339,7 +339,7 @@
     service_name: "haproxy-ssh"
     service: "{{ loadbalancer_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/loadbalancer/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check loadbalancer containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/magnum/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "magnum-api"
     service: "{{ magnum_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -21,7 +21,7 @@
     service_name: "magnum-conductor"
     service: "{{ magnum_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/magnum/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     magnum_api: "{{ magnum_services['magnum-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/magnum/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check magnum containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/manila/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "manila-api"
     service: "{{ manila_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "manila-data"
     service: "{{ manila_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -37,7 +37,7 @@
     service_name: "manila-scheduler"
     service: "{{ manila_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -53,7 +53,7 @@
     service_name: "manila-share"
     service: "{{ manila_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/manila/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     manila_api: "{{ manila_services['manila-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/manila/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check manila containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/mariadb/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "mariadb"
     service: "{{ mariadb_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     environment:
@@ -77,7 +77,7 @@
     service_name: "mariadb-clustercheck"
     service: "{{ mariadb_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     image: "{{ service.image }}"

ansible/roles/mariadb/tasks/backup.yml

@@ -1,7 +1,7 @@
 ---
 - name: Taking {{ mariadb_backup_type }} database backup via Mariabackup
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     command: "bash -c 'sudo -E kolla_set_configs && /usr/local/bin/kolla_mariadb_backup.sh'"
     common_options: "{{ docker_common_options }}"

ansible/roles/mariadb/tasks/bootstrap_cluster.yml

@@ -4,7 +4,7 @@
     service_name: "mariadb"
     service: "{{ mariadb_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/mariadb/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check mariadb containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/mariadb/tasks/lookup_cluster.yml

@@ -1,7 +1,7 @@
 ---
 - name: Create MariaDB volume
   become: true
-  kolla_docker:
+  kolla_container:
     action: "create_volume"
     common_options: "{{ docker_common_options }}"
     name: "mariadb"

ansible/roles/mariadb/tasks/post-upgrade.yml

@@ -4,7 +4,7 @@
     service_name: "mariadb"
     service: "{{ mariadb_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/mariadb/tasks/recover_cluster.yml

@@ -17,7 +17,7 @@
 - block:
     - name: Stop MariaDB containers
       become: true
-      kolla_docker:
+      kolla_container:
         name: "{{ mariadb_service.container_name }}"
         action: "stop_container"
         common_options: "{{ docker_common_options }}"
@@ -27,7 +27,7 @@
     # different container name to avoid the mariadb container being removed.
     - name: Run MariaDB wsrep recovery
       become: true
-      kolla_docker:
+      kolla_container:
         action: "start_container"
         common_options: "{{ docker_common_options }}"
         detach: false
@@ -110,7 +110,7 @@
 
 - name: Starting first MariaDB container
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     environment:
@@ -168,7 +168,7 @@
 
 - name: Restart slave MariaDB container(s)
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"
@@ -199,7 +199,7 @@
 
 - name: Restart master MariaDB container(s)
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/mariadb/tasks/restart_services.yml

@@ -4,7 +4,7 @@
     service_name: "mariadb"
     service: "{{ mariadb_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/masakari/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "masakari-api"
     service: "{{ masakari_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "masakari-engine"
     service: "{{ masakari_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "masakari-instancemonitor"
     service: "{{ masakari_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -52,7 +52,7 @@
     service_name: "masakari-hostmonitor"
     service: "{{ masakari_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/masakari/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     masakari_api: "{{ masakari_services['masakari-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/masakari/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check masakari containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"

ansible/roles/memcached/handlers/main.yml

@@ -3,7 +3,7 @@
   vars:
     service: "{{ memcached_services.memcached }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     image: "{{ service.image }}"

ansible/roles/memcached/tasks/check-containers.yml

@@ -3,7 +3,7 @@
   vars:
     service: "{{ memcached_services.memcached }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/mistral/handlers/main.yml

@@ -4,7 +4,7 @@
     service_name: "mistral-api"
     service: "{{ mistral_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -20,7 +20,7 @@
     service_name: "mistral-engine"
     service: "{{ mistral_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -36,7 +36,7 @@
     service_name: "mistral-event-engine"
     service: "{{ mistral_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
@@ -52,7 +52,7 @@
     service_name: "mistral-executor"
     service: "{{ mistral_services[service_name] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "recreate_or_restart_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"

ansible/roles/mistral/tasks/bootstrap_service.yml

@@ -3,7 +3,7 @@
   vars:
     mistral_api: "{{ mistral_services['mistral-api'] }}"
   become: true
-  kolla_docker:
+  kolla_container:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
     detach: False

ansible/roles/mistral/tasks/check-containers.yml

@@ -1,7 +1,7 @@
 ---
 - name: Check mistral containers
   become: true
-  kolla_docker:
+  kolla_container:
     action: "compare_container"
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"