diff options
201 files changed, 433 insertions, 428 deletions
diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_container.py index e7d4105b2..a2cf44daa 100644 --- a/ansible/library/kolla_docker.py +++ b/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 ''' diff --git a/ansible/module_utils/kolla_systemd_worker.py b/ansible/module_utils/kolla_systemd_worker.py index 58cd1338b..396d15c20 100644 --- a/ansible/module_utils/kolla_systemd_worker.py +++ b/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 diff --git a/ansible/roles/aodh/handlers/main.yml b/ansible/roles/aodh/handlers/main.yml index 4e7202503..4c1fa2842 100644 --- a/ansible/roles/aodh/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/aodh/tasks/bootstrap_service.yml b/ansible/roles/aodh/tasks/bootstrap_service.yml index dcb06a71b..24bca33dc 100644 --- a/ansible/roles/aodh/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/aodh/tasks/check-containers.yml b/ansible/roles/aodh/tasks/check-containers.yml index a84922675..2f263c4f7 100644 --- a/ansible/roles/aodh/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/barbican/handlers/main.yml b/ansible/roles/barbican/handlers/main.yml index 256ad1f52..a0f6065be 100644 --- a/ansible/roles/barbican/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/barbican/tasks/bootstrap_service.yml b/ansible/roles/barbican/tasks/bootstrap_service.yml index bc11c1722..7081abca5 100644 --- a/ansible/roles/barbican/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/barbican/tasks/check-containers.yml b/ansible/roles/barbican/tasks/check-containers.yml index e70d79566..d9dd4be71 100644 --- a/ansible/roles/barbican/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/bifrost/tasks/reconfigure.yml b/ansible/roles/bifrost/tasks/reconfigure.yml index fb0c1f820..63f746e71 100644 --- a/ansible/roles/bifrost/tasks/reconfigure.yml +++ b/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" diff --git a/ansible/roles/bifrost/tasks/start.yml b/ansible/roles/bifrost/tasks/start.yml index 53446f9df..3c7022c80 100644 --- a/ansible/roles/bifrost/tasks/start.yml +++ b/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 }}" diff --git a/ansible/roles/bifrost/tasks/stop.yml b/ansible/roles/bifrost/tasks/stop.yml index c6461c953..7609ad123 100644 --- a/ansible/roles/bifrost/tasks/stop.yml +++ b/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" diff --git a/ansible/roles/blazar/handlers/main.yml b/ansible/roles/blazar/handlers/main.yml index 4c08ddaef..47959436d 100644 --- a/ansible/roles/blazar/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/blazar/tasks/bootstrap_service.yml b/ansible/roles/blazar/tasks/bootstrap_service.yml index 476fe1f89..0e4b55219 100644 --- a/ansible/roles/blazar/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/blazar/tasks/check-containers.yml b/ansible/roles/blazar/tasks/check-containers.yml index 3553a0b3f..8cf271890 100644 --- a/ansible/roles/blazar/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/ceilometer/handlers/main.yml b/ansible/roles/ceilometer/handlers/main.yml index a8cff1655..93b272f99 100644 --- a/ansible/roles/ceilometer/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/ceilometer/tasks/bootstrap_service.yml b/ansible/roles/ceilometer/tasks/bootstrap_service.yml index cadd038a3..c62b56765 100644 --- a/ansible/roles/ceilometer/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/ceilometer/tasks/check-containers.yml b/ansible/roles/ceilometer/tasks/check-containers.yml index 95829411f..8bedd1b50 100644 --- a/ansible/roles/ceilometer/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/cinder/handlers/main.yml b/ansible/roles/cinder/handlers/main.yml index 59a08ca8d..ef0a7154c 100644 --- a/ansible/roles/cinder/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/cinder/tasks/bootstrap_service.yml b/ansible/roles/cinder/tasks/bootstrap_service.yml index ba23da879..a203f7d5b 100644 --- a/ansible/roles/cinder/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/cinder/tasks/check-containers.yml b/ansible/roles/cinder/tasks/check-containers.yml index 3f71fa8f4..c3f5ac2a2 100644 --- a/ansible/roles/cinder/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/cinder/tasks/reload.yml b/ansible/roles/cinder/tasks/reload.yml index a8d6dd328..6c9497f86 100644 --- a/ansible/roles/cinder/tasks/reload.yml +++ b/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 }}" diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml index 833654836..a402d547c 100644 --- a/ansible/roles/cinder/tasks/upgrade.yml +++ b/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 diff --git a/ansible/roles/cloudkitty/handlers/main.yml b/ansible/roles/cloudkitty/handlers/main.yml index e19a1e935..a149136d1 100644 --- a/ansible/roles/cloudkitty/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/cloudkitty/tasks/bootstrap_service.yml b/ansible/roles/cloudkitty/tasks/bootstrap_service.yml index 117bdce7d..17546383c 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/cloudkitty/tasks/check-containers.yml b/ansible/roles/cloudkitty/tasks/check-containers.yml index bc777d4cc..435ee43de 100644 --- a/ansible/roles/cloudkitty/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/collectd/handlers/main.yml b/ansible/roles/collectd/handlers/main.yml index b80f41c1b..2ecedbbfb 100644 --- a/ansible/roles/collectd/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/collectd/tasks/check-containers.yml b/ansible/roles/collectd/tasks/check-containers.yml index f49a677c8..18562710b 100644 --- a/ansible/roles/collectd/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/common/handlers/main.yml b/ansible/roles/common/handlers/main.yml index aad204f7f..7248adfba 100644 --- a/ansible/roles/common/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/common/tasks/bootstrap.yml b/ansible/roles/common/tasks/bootstrap.yml index 11777b722..fa853b1d1 100644 --- a/ansible/roles/common/tasks/bootstrap.yml +++ b/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" diff --git a/ansible/roles/common/tasks/check-containers.yml b/ansible/roles/common/tasks/check-containers.yml index 45f110a01..8550d8af5 100644 --- a/ansible/roles/common/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/cyborg/handlers/main.yml b/ansible/roles/cyborg/handlers/main.yml index 912378d01..f9279e881 100644 --- a/ansible/roles/cyborg/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/cyborg/tasks/bootstrap_service.yml b/ansible/roles/cyborg/tasks/bootstrap_service.yml index 5ea8f3e11..fbc9bf4f6 100644 --- a/ansible/roles/cyborg/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/cyborg/tasks/check-containers.yml b/ansible/roles/cyborg/tasks/check-containers.yml index f6245b4d0..9953f7b82 100644 --- a/ansible/roles/cyborg/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/designate/handlers/main.yml b/ansible/roles/designate/handlers/main.yml index c7b7c320b..5b081a899 100644 --- a/ansible/roles/designate/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/designate/tasks/bootstrap_service.yml b/ansible/roles/designate/tasks/bootstrap_service.yml index 3cf5bbc26..8452faacc 100644 --- a/ansible/roles/designate/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/designate/tasks/check-containers.yml b/ansible/roles/designate/tasks/check-containers.yml index efe6cac74..9edee6458 100644 --- a/ansible/roles/designate/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/etcd/handlers/main.yml b/ansible/roles/etcd/handlers/main.yml index dd5a3d1f9..1c397aa35 100644 --- a/ansible/roles/etcd/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/etcd/tasks/check-containers.yml b/ansible/roles/etcd/tasks/check-containers.yml index aa39144d3..3a19a4a87 100644 --- a/ansible/roles/etcd/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/freezer/handlers/main.yml b/ansible/roles/freezer/handlers/main.yml index 0ca41d0c9..e473b7727 100644 --- a/ansible/roles/freezer/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/freezer/tasks/bootstrap_service.yml b/ansible/roles/freezer/tasks/bootstrap_service.yml index 1559c7ad2..ee471e5e3 100644 --- a/ansible/roles/freezer/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/freezer/tasks/check-containers.yml b/ansible/roles/freezer/tasks/check-containers.yml index 1e5034dae..65641cc50 100644 --- a/ansible/roles/freezer/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/glance/handlers/main.yml b/ansible/roles/glance/handlers/main.yml index 85d5e4e87..9d8e7da27 100644 --- a/ansible/roles/glance/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/glance/tasks/bootstrap_service.yml b/ansible/roles/glance/tasks/bootstrap_service.yml index e56c1072b..2645e647a 100644 --- a/ansible/roles/glance/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/glance/tasks/check-containers.yml b/ansible/roles/glance/tasks/check-containers.yml index abea314d8..763ded863 100644 --- a/ansible/roles/glance/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/glance/tasks/rolling_upgrade.yml b/ansible/roles/glance/tasks/rolling_upgrade.yml index 313dd88b3..772ed0df3 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/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 diff --git a/ansible/roles/glance/tasks/stop_service.yml b/ansible/roles/glance/tasks/stop_service.yml index a98c46075..ecce6c4f0 100644 --- a/ansible/roles/glance/tasks/stop_service.yml +++ b/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 }}" diff --git a/ansible/roles/gnocchi/handlers/main.yml b/ansible/roles/gnocchi/handlers/main.yml index cc2d5762a..63ef2a869 100644 --- a/ansible/roles/gnocchi/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/gnocchi/tasks/bootstrap_service.yml b/ansible/roles/gnocchi/tasks/bootstrap_service.yml index 12e242be6..3f9e8090c 100644 --- a/ansible/roles/gnocchi/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/gnocchi/tasks/check-containers.yml b/ansible/roles/gnocchi/tasks/check-containers.yml index ed92fb1da..4e9820408 100644 --- a/ansible/roles/gnocchi/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/grafana/handlers/main.yml b/ansible/roles/grafana/handlers/main.yml index e3e1d4e30..8e45b53e7 100644 --- a/ansible/roles/grafana/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/grafana/tasks/check-containers.yml b/ansible/roles/grafana/tasks/check-containers.yml index bb2f46ae7..8f2ede7cc 100644 --- a/ansible/roles/grafana/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/grafana/tasks/upgrade.yml b/ansible/roles/grafana/tasks/upgrade.yml index ce6e87e99..88e2196dd 100644 --- a/ansible/roles/grafana/tasks/upgrade.yml +++ b/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 }}" diff --git a/ansible/roles/hacluster/handlers/main.yml b/ansible/roles/hacluster/handlers/main.yml index 8f9d62a39..b694d72b5 100644 --- a/ansible/roles/hacluster/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/hacluster/tasks/check-containers.yml b/ansible/roles/hacluster/tasks/check-containers.yml index 6db67a950..0a0f8253e 100644 --- a/ansible/roles/hacluster/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/heat/handlers/main.yml b/ansible/roles/heat/handlers/main.yml index e5569dc9b..326f8d76d 100644 --- a/ansible/roles/heat/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/heat/tasks/bootstrap_service.yml b/ansible/roles/heat/tasks/bootstrap_service.yml index 8abb52f5d..872c456f1 100644 --- a/ansible/roles/heat/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/heat/tasks/check-containers.yml b/ansible/roles/heat/tasks/check-containers.yml index 4ed5471a5..fbe52d9b4 100644 --- a/ansible/roles/heat/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/horizon/handlers/main.yml b/ansible/roles/horizon/handlers/main.yml index 51b41dc4c..18cab1614 100644 --- a/ansible/roles/horizon/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/horizon/tasks/bootstrap_service.yml b/ansible/roles/horizon/tasks/bootstrap_service.yml index 397bed9df..74454a991 100644 --- a/ansible/roles/horizon/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/horizon/tasks/check-containers.yml b/ansible/roles/horizon/tasks/check-containers.yml index 8bec8a6dd..e956f3560 100644 --- a/ansible/roles/horizon/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/influxdb/handlers/main.yml b/ansible/roles/influxdb/handlers/main.yml index 493df2075..92e279f24 100644 --- a/ansible/roles/influxdb/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/influxdb/tasks/check-containers.yml b/ansible/roles/influxdb/tasks/check-containers.yml index 8807355df..0036fd640 100644 --- a/ansible/roles/influxdb/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/ironic/handlers/main.yml b/ansible/roles/ironic/handlers/main.yml index 8155cd4bf..688f77bc8 100644 --- a/ansible/roles/ironic/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/ironic/tasks/bootstrap_service.yml b/ansible/roles/ironic/tasks/bootstrap_service.yml index c8293d4bc..3b46f90ee 100644 --- a/ansible/roles/ironic/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/ironic/tasks/check-containers.yml b/ansible/roles/ironic/tasks/check-containers.yml index b7e5fe123..8bba5411f 100644 --- a/ansible/roles/ironic/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/ironic/tasks/rolling_upgrade.yml b/ansible/roles/ironic/tasks/rolling_upgrade.yml index 52a3cdda0..d3577e412 100644 --- a/ansible/roles/ironic/tasks/rolling_upgrade.yml +++ b/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 diff --git a/ansible/roles/iscsi/handlers/main.yml b/ansible/roles/iscsi/handlers/main.yml index 5efd8cc82..ef380f9e2 100644 --- a/ansible/roles/iscsi/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/iscsi/tasks/check-containers.yml b/ansible/roles/iscsi/tasks/check-containers.yml index ed85f5062..76cd9cd18 100644 --- a/ansible/roles/iscsi/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/keystone/handlers/main.yml b/ansible/roles/keystone/handlers/main.yml index d57036e53..f7a24310b 100644 --- a/ansible/roles/keystone/handlers/main.yml +++ b/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 diff --git a/ansible/roles/keystone/tasks/bootstrap_service.yml b/ansible/roles/keystone/tasks/bootstrap_service.yml index 73cd6bd93..3b8be515c 100644 --- a/ansible/roles/keystone/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/keystone/tasks/check-containers.yml b/ansible/roles/keystone/tasks/check-containers.yml index 03f4ffffb..98184af69 100644 --- a/ansible/roles/keystone/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/kuryr/handlers/main.yml b/ansible/roles/kuryr/handlers/main.yml index 3b7dbac15..361822e88 100644 --- a/ansible/roles/kuryr/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/kuryr/tasks/check-containers.yml b/ansible/roles/kuryr/tasks/check-containers.yml index 7a7d5a7e9..86e2f1716 100644 --- a/ansible/roles/kuryr/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/letsencrypt/handlers/main.yml b/ansible/roles/letsencrypt/handlers/main.yml index 9e2610c8c..2063cf677 100644 --- a/ansible/roles/letsencrypt/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/letsencrypt/tasks/check-containers.yml b/ansible/roles/letsencrypt/tasks/check-containers.yml index 6ca67c510..559baba73 100644 --- a/ansible/roles/letsencrypt/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/letsencrypt/tasks/pull.yml b/ansible/roles/letsencrypt/tasks/pull.yml index 03283078d..33880e0b3 100644 --- a/ansible/roles/letsencrypt/tasks/pull.yml +++ b/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 }}" diff --git a/ansible/roles/loadbalancer/handlers/main.yml b/ansible/roles/loadbalancer/handlers/main.yml index f78e3d59c..a94a740ca 100644 --- a/ansible/roles/loadbalancer/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/loadbalancer/tasks/check-containers.yml b/ansible/roles/loadbalancer/tasks/check-containers.yml index d2c403541..bb2798739 100644 --- a/ansible/roles/loadbalancer/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/magnum/handlers/main.yml b/ansible/roles/magnum/handlers/main.yml index 049877a58..515e67971 100644 --- a/ansible/roles/magnum/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/magnum/tasks/bootstrap_service.yml b/ansible/roles/magnum/tasks/bootstrap_service.yml index 9b4563ab5..9ebf3aefc 100644 --- a/ansible/roles/magnum/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/magnum/tasks/check-containers.yml b/ansible/roles/magnum/tasks/check-containers.yml index 96882bd03..ca50adada 100644 --- a/ansible/roles/magnum/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/manila/handlers/main.yml b/ansible/roles/manila/handlers/main.yml index d7ef447b1..c5f3fda94 100644 --- a/ansible/roles/manila/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/manila/tasks/bootstrap_service.yml b/ansible/roles/manila/tasks/bootstrap_service.yml index c820d54f5..f3e72da72 100644 --- a/ansible/roles/manila/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/manila/tasks/check-containers.yml b/ansible/roles/manila/tasks/check-containers.yml index 18fc052f8..7c3091ec7 100644 --- a/ansible/roles/manila/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/mariadb/handlers/main.yml b/ansible/roles/mariadb/handlers/main.yml index 87b01ade0..708ba1bb2 100644 --- a/ansible/roles/mariadb/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/mariadb/tasks/backup.yml b/ansible/roles/mariadb/tasks/backup.yml index 8095285e8..ef78107eb 100644 --- a/ansible/roles/mariadb/tasks/backup.yml +++ b/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 }}" diff --git a/ansible/roles/mariadb/tasks/bootstrap_cluster.yml b/ansible/roles/mariadb/tasks/bootstrap_cluster.yml index 866cf609f..9a412c357 100644 --- a/ansible/roles/mariadb/tasks/bootstrap_cluster.yml +++ b/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 diff --git a/ansible/roles/mariadb/tasks/check-containers.yml b/ansible/roles/mariadb/tasks/check-containers.yml index e7a65d60e..e8a5b990c 100644 --- a/ansible/roles/mariadb/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/mariadb/tasks/lookup_cluster.yml b/ansible/roles/mariadb/tasks/lookup_cluster.yml index 409491776..12d859a6f 100644 --- a/ansible/roles/mariadb/tasks/lookup_cluster.yml +++ b/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" diff --git a/ansible/roles/mariadb/tasks/post-upgrade.yml b/ansible/roles/mariadb/tasks/post-upgrade.yml index da40c677c..ac878bef6 100644 --- a/ansible/roles/mariadb/tasks/post-upgrade.yml +++ b/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 diff --git a/ansible/roles/mariadb/tasks/recover_cluster.yml b/ansible/roles/mariadb/tasks/recover_cluster.yml index 118af3093..0c36e42fa 100644 --- a/ansible/roles/mariadb/tasks/recover_cluster.yml +++ b/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 }}" diff --git a/ansible/roles/mariadb/tasks/restart_services.yml b/ansible/roles/mariadb/tasks/restart_services.yml index b80c909f3..d9b911c2d 100644 --- a/ansible/roles/mariadb/tasks/restart_services.yml +++ b/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 }}" diff --git a/ansible/roles/masakari/handlers/main.yml b/ansible/roles/masakari/handlers/main.yml index b78bc4b93..13d3e1446 100644 --- a/ansible/roles/masakari/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/masakari/tasks/bootstrap_service.yml b/ansible/roles/masakari/tasks/bootstrap_service.yml index cc8d6745c..62f02128c 100644 --- a/ansible/roles/masakari/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/masakari/tasks/check-containers.yml b/ansible/roles/masakari/tasks/check-containers.yml index 027f2d331..004a28798 100644 --- a/ansible/roles/masakari/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/memcached/handlers/main.yml b/ansible/roles/memcached/handlers/main.yml index 4bdfe525e..664de4c9a 100644 --- a/ansible/roles/memcached/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/memcached/tasks/check-containers.yml b/ansible/roles/memcached/tasks/check-containers.yml index d74e92991..120b3ecee 100644 --- a/ansible/roles/memcached/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/mistral/handlers/main.yml b/ansible/roles/mistral/handlers/main.yml index 60a3852c5..4504f7007 100644 --- a/ansible/roles/mistral/handlers/main.yml +++ b/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 }}" diff --git a/ansible/roles/mistral/tasks/bootstrap_service.yml b/ansible/roles/mistral/tasks/bootstrap_service.yml index 562f00f9c..3fb1f2bb2 100644 --- a/ansible/roles/mistral/tasks/bootstrap_service.yml +++ b/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 diff --git a/ansible/roles/mistral/tasks/check-containers.yml b/ansible/roles/mistral/tasks/check-containers.yml index adf9eb8cd..81ba36d15 100644 --- a/ansible/roles/mistral/tasks/check-containers.yml +++ b/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 }}" diff --git a/ansible/roles/multipathd/handlers/main.yml b/ansible/roles/multipathd/handlers/main.yml index 91983d448..c04cb9d2e 100644 --- a/ansible/roles/multipathd/handlers/main.yml +++ b/ansible/roles/multipathd/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "multipathd" service: "{{ multipathd_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/multipathd/tasks/check-containers.yml b/ansible/roles/multipathd/tasks/check-containers.yml index e2ebb98cb..fe82a085f 100644 --- a/ansible/roles/multipathd/tasks/check-containers.yml +++ b/ansible/roles/multipathd/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check multipathd containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/murano/handlers/main.yml b/ansible/roles/murano/handlers/main.yml index c9eb955f4..a90d8cd9e 100644 --- a/ansible/roles/murano/handlers/main.yml +++ b/ansible/roles/murano/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "murano-api" service: "{{ murano_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: "murano-engine" service: "{{ murano_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/murano/tasks/bootstrap_service.yml b/ansible/roles/murano/tasks/bootstrap_service.yml index c4c14cec1..f31349769 100644 --- a/ansible/roles/murano/tasks/bootstrap_service.yml +++ b/ansible/roles/murano/tasks/bootstrap_service.yml @@ -1,7 +1,7 @@ --- - name: Running Murano bootstrap container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/murano/tasks/check-containers.yml b/ansible/roles/murano/tasks/check-containers.yml index cabcf1262..76ee8c030 100644 --- a/ansible/roles/murano/tasks/check-containers.yml +++ b/ansible/roles/murano/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check murano containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/neutron/handlers/main.yml b/ansible/roles/neutron/handlers/main.yml index f34863934..6d6a547f0 100644 --- a/ansible/roles/neutron/handlers/main.yml +++ b/ansible/roles/neutron/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "neutron-server" service: "{{ neutron_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: "neutron-openvswitch-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -39,7 +39,7 @@ service_name: "neutron-openvswitch-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -57,7 +57,7 @@ service_name: "neutron-linuxbridge-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -75,7 +75,7 @@ service_name: "neutron-dhcp-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -108,7 +108,7 @@ service_name: "neutron-l3-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -138,7 +138,7 @@ service_name: "neutron-l3-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -161,7 +161,7 @@ service_name: "neutron-sriov-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -178,7 +178,7 @@ service_name: "neutron-mlnx-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -194,7 +194,7 @@ service_name: "neutron-eswitchd" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -210,7 +210,7 @@ service_name: "neutron-tls-proxy" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -226,7 +226,7 @@ service_name: "neutron-metadata-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -243,7 +243,7 @@ service_name: "neutron-ovn-metadata-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -260,7 +260,7 @@ service_name: "neutron-bgp-dragent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -277,7 +277,7 @@ service_name: "neutron-infoblox-ipam-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -294,7 +294,7 @@ service_name: "neutron-metering-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -311,7 +311,7 @@ service_name: "ironic-neutron-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -328,7 +328,7 @@ service_name: "neutron-ovn-agent" service: "{{ neutron_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/neutron/tasks/bootstrap_service.yml b/ansible/roles/neutron/tasks/bootstrap_service.yml index 2a61c86c4..094f4ca96 100644 --- a/ansible/roles/neutron/tasks/bootstrap_service.yml +++ b/ansible/roles/neutron/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: neutron_server: "{{ neutron_services['neutron-server'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/neutron/tasks/check-containers.yml b/ansible/roles/neutron/tasks/check-containers.yml index 19917220a..42bfb1fcc 100644 --- a/ansible/roles/neutron/tasks/check-containers.yml +++ b/ansible/roles/neutron/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check neutron containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml index d39299016..ea26ba7c5 100644 --- a/ansible/roles/neutron/tasks/config-neutron-fake.yml +++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml @@ -64,7 +64,7 @@ vars: neutron_openvswitch_agent: "{{ neutron_services['neutron-openvswitch-agent'] }}" become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ neutron_openvswitch_agent.container_name }}" diff --git a/ansible/roles/neutron/tasks/rolling_upgrade.yml b/ansible/roles/neutron/tasks/rolling_upgrade.yml index 17801c7b8..e5fb3a53f 100644 --- a/ansible/roles/neutron/tasks/rolling_upgrade.yml +++ b/ansible/roles/neutron/tasks/rolling_upgrade.yml @@ -14,7 +14,7 @@ vars: neutron_server: "{{ neutron_services['neutron-server'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False @@ -52,7 +52,7 @@ filter_rc: "results[?rc!=`0`]" is_stop_neutron_server: "{{ results_of_check_pending_contract_scripts | json_query(filter_rc) }}" become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "{{ neutron_server.container_name }}" @@ -66,7 +66,7 @@ vars: neutron_server: "{{ neutron_services['neutron-server'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/nova-cell/handlers/main.yml b/ansible/roles/nova-cell/handlers/main.yml index 5ad5dc980..bdc6f86d6 100644 --- a/ansible/roles/nova-cell/handlers/main.yml +++ b/ansible/roles/nova-cell/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "nova-conductor" service: "{{ nova_cell_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: "nova-novncproxy" service: "{{ nova_cell_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -40,7 +40,7 @@ service_name: "nova-spicehtml5proxy" service: "{{ nova_cell_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -58,7 +58,7 @@ service_name: "nova-serialproxy" service: "{{ nova_cell_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -76,7 +76,7 @@ service_name: "nova-ssh" service: "{{ nova_cell_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -95,7 +95,7 @@ service: "{{ nova_cell_services[service_name] }}" nova_libvirt_notify: "{{ ['Checking libvirt container is ready', 'Create libvirt SASL user'] if libvirt_enable_sasl | bool else [] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -153,7 +153,7 @@ service_name: "nova-compute" service: "{{ nova_cell_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -172,7 +172,7 @@ service_name: "nova-compute-ironic" service: "{{ nova_cell_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -188,7 +188,7 @@ # so put all variables here rather than defaults/main.yml file - name: Restart nova-compute-fake containers become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "nova_compute_fake_{{ item }}" diff --git a/ansible/roles/nova-cell/tasks/bootstrap_service.yml b/ansible/roles/nova-cell/tasks/bootstrap_service.yml index 23b6b4c50..e4a4d2b2c 100644 --- a/ansible/roles/nova-cell/tasks/bootstrap_service.yml +++ b/ansible/roles/nova-cell/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ become: true vars: nova_conductor: "{{ nova_cell_services['nova-conductor'] }}" - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/nova-cell/tasks/check-containers.yml b/ansible/roles/nova-cell/tasks/check-containers.yml index 1213765a3..4860124e1 100644 --- a/ansible/roles/nova-cell/tasks/check-containers.yml +++ b/ansible/roles/nova-cell/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check nova-cell containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/nova-cell/tasks/config-nova-fake.yml b/ansible/roles/nova-cell/tasks/config-nova-fake.yml index be69093d1..8959dfa14 100644 --- a/ansible/roles/nova-cell/tasks/config-nova-fake.yml +++ b/ansible/roles/nova-cell/tasks/config-nova-fake.yml @@ -47,7 +47,7 @@ - name: Check nova-compute-fake containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "nova_compute_fake_{{ item }}" diff --git a/ansible/roles/nova-cell/tasks/create_cells.yml b/ansible/roles/nova-cell/tasks/create_cells.yml index 2300098e0..ac29e61ef 100644 --- a/ansible/roles/nova-cell/tasks/create_cells.yml +++ b/ansible/roles/nova-cell/tasks/create_cells.yml @@ -7,7 +7,7 @@ vars: nova_conductor: "{{ nova_cell_services['nova-conductor'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" command: bash -c 'sudo -E kolla_set_configs && nova-manage cell_v2 create_cell{% if nova_cell_name %} --name {{ nova_cell_name }}{% endif %}' common_options: "{{ docker_common_options }}" @@ -33,7 +33,7 @@ nova_cell_database_url: "mysql+pymysql://{{ nova_cell_database_user }}:{{ nova_cell_database_password }}@{{ nova_cell_database_address | put_address_in_context('url') }}:{{ nova_cell_database_port }}/{{ nova_cell_database_name }}" # noqa 204 nova_conductor: "{{ nova_cell_services['nova-conductor'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" command: "bash -c 'sudo -E kolla_set_configs && nova-manage cell_v2 update_cell --cell_uuid {{ nova_cell_settings.cell_uuid }}'" common_options: "{{ docker_common_options }}" diff --git a/ansible/roles/nova-cell/tasks/get_cell_settings.yml b/ansible/roles/nova-cell/tasks/get_cell_settings.yml index bbeed0644..b5b808399 100644 --- a/ansible/roles/nova-cell/tasks/get_cell_settings.yml +++ b/ansible/roles/nova-cell/tasks/get_cell_settings.yml @@ -3,7 +3,7 @@ vars: nova_conductor: "{{ nova_cell_services['nova-conductor'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" command: bash -c 'sudo -E kolla_set_configs && nova-manage cell_v2 list_cells --verbose' common_options: "{{ docker_common_options }}" diff --git a/ansible/roles/nova-cell/tasks/libvirt-cleanup.yml b/ansible/roles/nova-cell/tasks/libvirt-cleanup.yml index 140a096bf..95fb670b5 100644 --- a/ansible/roles/nova-cell/tasks/libvirt-cleanup.yml +++ b/ansible/roles/nova-cell/tasks/libvirt-cleanup.yml @@ -36,7 +36,7 @@ - name: Stop and remove nova_libvirt container become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" action: "stop_and_remove_container" name: nova_libvirt @@ -44,7 +44,7 @@ - name: Remove nova_libvirt Docker volumes become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" action: "remove_volume" name: "{{ item }}" diff --git a/ansible/roles/nova-cell/tasks/online_data_migrations.yml b/ansible/roles/nova-cell/tasks/online_data_migrations.yml index b8b329a88..9240c14e0 100644 --- a/ansible/roles/nova-cell/tasks/online_data_migrations.yml +++ b/ansible/roles/nova-cell/tasks/online_data_migrations.yml @@ -3,7 +3,7 @@ vars: nova_conductor: "{{ nova_cell_services['nova-conductor'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/nova-cell/tasks/reload.yml b/ansible/roles/nova-cell/tasks/reload.yml index 1644cebef..f365035b1 100644 --- a/ansible/roles/nova-cell/tasks/reload.yml +++ b/ansible/roles/nova-cell/tasks/reload.yml @@ -22,7 +22,7 @@ vars: service: "{{ nova_cell_services[item] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/nova-cell/tasks/upgrade.yml b/ansible/roles/nova-cell/tasks/upgrade.yml index 405ab8968..46926af6c 100644 --- a/ansible/roles/nova-cell/tasks/upgrade.yml +++ b/ansible/roles/nova-cell/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- - name: Stopping nova cell services become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/nova/handlers/main.yml b/ansible/roles/nova/handlers/main.yml index 0cdd184c5..b83ed911e 100644 --- a/ansible/roles/nova/handlers/main.yml +++ b/ansible/roles/nova/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "nova-super-conductor" service: "{{ nova_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: "nova-scheduler" service: "{{ nova_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -40,7 +40,7 @@ service_name: "nova-api" service: "{{ nova_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/nova/tasks/bootstrap_service.yml b/ansible/roles/nova/tasks/bootstrap_service.yml index 146ad0296..bf34743b0 100644 --- a/ansible/roles/nova/tasks/bootstrap_service.yml +++ b/ansible/roles/nova/tasks/bootstrap_service.yml @@ -5,7 +5,7 @@ become: true vars: nova_api: "{{ nova_services['nova-api'] }}" - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/nova/tasks/check-containers.yml b/ansible/roles/nova/tasks/check-containers.yml index 480531574..b03d89e67 100644 --- a/ansible/roles/nova/tasks/check-containers.yml +++ b/ansible/roles/nova/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check nova containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/nova/tasks/map_cell0.yml b/ansible/roles/nova/tasks/map_cell0.yml index 5e7ddcffd..3fcee26a0 100644 --- a/ansible/roles/nova/tasks/map_cell0.yml +++ b/ansible/roles/nova/tasks/map_cell0.yml @@ -4,7 +4,7 @@ nova_api: "{{ nova_services['nova-api'] }}" nova_cell0_connection: "mysql+pymysql://{{ nova_cell0_database_user }}:{{ nova_cell0_database_password }}@{{ nova_cell0_database_address }}/{{ nova_cell0_database_name }}" # noqa 204 become: true - kolla_docker: + kolla_container: action: "start_container" command: bash -c 'sudo -E kolla_set_configs && nova-manage cell_v2 map_cell0 --database_connection {{ nova_cell0_connection }}' common_options: "{{ docker_common_options }}" diff --git a/ansible/roles/nova/tasks/online_data_migrations.yml b/ansible/roles/nova/tasks/online_data_migrations.yml index 999e3b98a..cd9f69baf 100644 --- a/ansible/roles/nova/tasks/online_data_migrations.yml +++ b/ansible/roles/nova/tasks/online_data_migrations.yml @@ -3,7 +3,7 @@ vars: nova_api: "{{ nova_services['nova-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/nova/tasks/reload_api.yml b/ansible/roles/nova/tasks/reload_api.yml index 858f59576..f1813edec 100644 --- a/ansible/roles/nova/tasks/reload_api.yml +++ b/ansible/roles/nova/tasks/reload_api.yml @@ -6,7 +6,7 @@ vars: service: "{{ nova_services[item] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/nova/tasks/reload_super_conductor.yml b/ansible/roles/nova/tasks/reload_super_conductor.yml index edc3a165b..e9b10b9a9 100644 --- a/ansible/roles/nova/tasks/reload_super_conductor.yml +++ b/ansible/roles/nova/tasks/reload_super_conductor.yml @@ -6,7 +6,7 @@ vars: service: "{{ nova_services['nova-super-conductor'] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml index 1e80b2abe..88fdb63c5 100644 --- a/ansible/roles/nova/tasks/upgrade.yml +++ b/ansible/roles/nova/tasks/upgrade.yml @@ -3,7 +3,7 @@ become: true vars: nova_api: "{{ nova_services['nova-api'] }}" - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False @@ -33,7 +33,7 @@ - name: Stopping top level nova services become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/octavia/handlers/main.yml b/ansible/roles/octavia/handlers/main.yml index 139538ea9..deb8ae438 100644 --- a/ansible/roles/octavia/handlers/main.yml +++ b/ansible/roles/octavia/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "octavia-api" service: "{{ octavia_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: "octavia-driver-agent" service: "{{ octavia_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -35,7 +35,7 @@ service_name: "octavia-health-manager" service: "{{ octavia_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -51,7 +51,7 @@ service_name: "octavia-housekeeping" service: "{{ octavia_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -67,7 +67,7 @@ service_name: "octavia-worker" service: "{{ octavia_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/octavia/tasks/bootstrap_service.yml b/ansible/roles/octavia/tasks/bootstrap_service.yml index fee159487..c1c7b9501 100644 --- a/ansible/roles/octavia/tasks/bootstrap_service.yml +++ b/ansible/roles/octavia/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: octavia_api: "{{ octavia_services['octavia-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/octavia/tasks/check-containers.yml b/ansible/roles/octavia/tasks/check-containers.yml index 1c3a518e3..a29016511 100644 --- a/ansible/roles/octavia/tasks/check-containers.yml +++ b/ansible/roles/octavia/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check octavia containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/opensearch/handlers/main.yml b/ansible/roles/opensearch/handlers/main.yml index 9d4e0b352..a32287297 100644 --- a/ansible/roles/opensearch/handlers/main.yml +++ b/ansible/roles/opensearch/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "opensearch" service: "{{ opensearch_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: "opensearch-dashboards" service: "{{ opensearch_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" dimensions: "{{ service.dimensions }}" diff --git a/ansible/roles/opensearch/tasks/check-containers.yml b/ansible/roles/opensearch/tasks/check-containers.yml index 5efb102e9..a8466feb6 100644 --- a/ansible/roles/opensearch/tasks/check-containers.yml +++ b/ansible/roles/opensearch/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check opensearch containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" dimensions: "{{ item.value.dimensions }}" diff --git a/ansible/roles/openvswitch/handlers/main.yml b/ansible/roles/openvswitch/handlers/main.yml index a97ea7d59..6a311fdff 100644 --- a/ansible/roles/openvswitch/handlers/main.yml +++ b/ansible/roles/openvswitch/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "openvswitch-db-server" service: "{{ openvswitch_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -31,7 +31,7 @@ service_name: "openvswitch-vswitchd" service: "{{ openvswitch_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/openvswitch/tasks/check-containers.yml b/ansible/roles/openvswitch/tasks/check-containers.yml index 81f05f012..406ed11a2 100644 --- a/ansible/roles/openvswitch/tasks/check-containers.yml +++ b/ansible/roles/openvswitch/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check openvswitch containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/ovn-controller/handlers/main.yml b/ansible/roles/ovn-controller/handlers/main.yml index 165e7c0d3..6068d9fb4 100644 --- a/ansible/roles/ovn-controller/handlers/main.yml +++ b/ansible/roles/ovn-controller/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "ovn-controller" service: "{{ ovn_controller_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/ovn-controller/tasks/check-containers.yml b/ansible/roles/ovn-controller/tasks/check-containers.yml index a7cef3d95..86bbf4235 100644 --- a/ansible/roles/ovn-controller/tasks/check-containers.yml +++ b/ansible/roles/ovn-controller/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check ovn-controller containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/ovn-db/handlers/main.yml b/ansible/roles/ovn-db/handlers/main.yml index 88939501d..deb302b93 100644 --- a/ansible/roles/ovn-db/handlers/main.yml +++ b/ansible/roles/ovn-db/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "ovn-nb-db" service: "{{ ovn_db_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: "ovn-sb-db" service: "{{ ovn_db_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -34,7 +34,7 @@ service_name: "ovn-northd" service: "{{ ovn_db_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/ovn-db/tasks/check-containers.yml b/ansible/roles/ovn-db/tasks/check-containers.yml index 5527b7d08..9c298a4ff 100644 --- a/ansible/roles/ovn-db/tasks/check-containers.yml +++ b/ansible/roles/ovn-db/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check ovn containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/ovs-dpdk/handlers/main.yml b/ansible/roles/ovs-dpdk/handlers/main.yml index a52ca0be6..6533aa4a0 100644 --- a/ansible/roles/ovs-dpdk/handlers/main.yml +++ b/ansible/roles/ovs-dpdk/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "ovsdpdk-db" service: "{{ ovsdpdk_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -56,7 +56,7 @@ service_name: "ovsdpdk-vswitchd" service: "{{ ovsdpdk_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/ovs-dpdk/tasks/check-containers.yml b/ansible/roles/ovs-dpdk/tasks/check-containers.yml index 0e4f17887..0a38b550f 100644 --- a/ansible/roles/ovs-dpdk/tasks/check-containers.yml +++ b/ansible/roles/ovs-dpdk/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check ovs containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/placement/handlers/main.yml b/ansible/roles/placement/handlers/main.yml index a3d0ad103..8c2a8c8b6 100644 --- a/ansible/roles/placement/handlers/main.yml +++ b/ansible/roles/placement/handlers/main.yml @@ -4,7 +4,7 @@ vars: service_name: "placement-api" service: "{{ placement_services[service_name] }}" - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/placement/tasks/bootstrap_service.yml b/ansible/roles/placement/tasks/bootstrap_service.yml index 1f347a9f4..9a9ded8e0 100644 --- a/ansible/roles/placement/tasks/bootstrap_service.yml +++ b/ansible/roles/placement/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: placement_api: "{{ placement_services['placement-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/placement/tasks/check-containers.yml b/ansible/roles/placement/tasks/check-containers.yml index be5e92f9d..e8984bf63 100644 --- a/ansible/roles/placement/tasks/check-containers.yml +++ b/ansible/roles/placement/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check placement containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/placement/tasks/upgrade.yml b/ansible/roles/placement/tasks/upgrade.yml index 26aa26b9d..8853cd9f1 100644 --- a/ansible/roles/placement/tasks/upgrade.yml +++ b/ansible/roles/placement/tasks/upgrade.yml @@ -17,7 +17,7 @@ vars: placement_api: "{{ placement_services['placement-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/prometheus/handlers/main.yml b/ansible/roles/prometheus/handlers/main.yml index ca6b319f8..e9bccb5b4 100644 --- a/ansible/roles/prometheus/handlers/main.yml +++ b/ansible/roles/prometheus/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "prometheus-server" service: "{{ prometheus_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: "prometheus-node-exporter" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -35,7 +35,7 @@ service_name: "prometheus-mysqld-exporter" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -50,7 +50,7 @@ service_name: "prometheus-haproxy-exporter" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -65,7 +65,7 @@ service_name: "prometheus-memcached-exporter" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -80,7 +80,7 @@ service_name: "prometheus-cadvisor" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -95,7 +95,7 @@ service_name: "prometheus-alertmanager" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -110,7 +110,7 @@ service_name: "prometheus-openstack-exporter" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -126,7 +126,7 @@ service_name: "prometheus-elasticsearch-exporter" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -141,7 +141,7 @@ service_name: "prometheus-blackbox-exporter" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -156,7 +156,7 @@ service_name: "prometheus-libvirt-exporter" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -171,7 +171,7 @@ service_name: "prometheus-msteams" service: "{{ prometheus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" environment: "{{ service.environment }}" diff --git a/ansible/roles/prometheus/tasks/check-containers.yml b/ansible/roles/prometheus/tasks/check-containers.yml index e38d38e4d..4673443b9 100644 --- a/ansible/roles/prometheus/tasks/check-containers.yml +++ b/ansible/roles/prometheus/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check prometheus containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/rabbitmq/tasks/bootstrap.yml b/ansible/roles/rabbitmq/tasks/bootstrap.yml index ceeca4700..a63e2073c 100644 --- a/ansible/roles/rabbitmq/tasks/bootstrap.yml +++ b/ansible/roles/rabbitmq/tasks/bootstrap.yml @@ -1,7 +1,7 @@ --- - name: Creating rabbitmq volume become: true - kolla_docker: + kolla_container: action: "create_volume" common_options: "{{ docker_common_options }}" name: "{{ project_name }}" @@ -12,7 +12,7 @@ service_name: "rabbitmq" service: "{{ rabbitmq_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/rabbitmq/tasks/check-containers.yml b/ansible/roles/rabbitmq/tasks/check-containers.yml index 72cbb2ba6..740ac66fe 100644 --- a/ansible/roles/rabbitmq/tasks/check-containers.yml +++ b/ansible/roles/rabbitmq/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check rabbitmq containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/rabbitmq/tasks/restart_services.yml b/ansible/roles/rabbitmq/tasks/restart_services.yml index e7b5297ee..c94e1f548 100644 --- a/ansible/roles/rabbitmq/tasks/restart_services.yml +++ b/ansible/roles/rabbitmq/tasks/restart_services.yml @@ -21,7 +21,7 @@ service_name: "rabbitmq" service: "{{ rabbitmq_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/redis/handlers/main.yml b/ansible/roles/redis/handlers/main.yml index b0a5de770..a4e432e05 100644 --- a/ansible/roles/redis/handlers/main.yml +++ b/ansible/roles/redis/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "redis" service: "{{ redis_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: "redis-sentinel" service: "{{ redis_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/redis/tasks/check-containers.yml b/ansible/roles/redis/tasks/check-containers.yml index 0d32104ee..9016b7370 100644 --- a/ansible/roles/redis/tasks/check-containers.yml +++ b/ansible/roles/redis/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check redis containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/sahara/handlers/main.yml b/ansible/roles/sahara/handlers/main.yml index d96468297..eedc5c4ad 100644 --- a/ansible/roles/sahara/handlers/main.yml +++ b/ansible/roles/sahara/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "sahara-api" service: "{{ sahara_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: "sahara-engine" service: "{{ sahara_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/sahara/tasks/bootstrap_service.yml b/ansible/roles/sahara/tasks/bootstrap_service.yml index 7e119608e..39cb3a749 100644 --- a/ansible/roles/sahara/tasks/bootstrap_service.yml +++ b/ansible/roles/sahara/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: sahara_api: "{{ sahara_services['sahara-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/sahara/tasks/check-containers.yml b/ansible/roles/sahara/tasks/check-containers.yml index c224d5477..4e8f499af 100644 --- a/ansible/roles/sahara/tasks/check-containers.yml +++ b/ansible/roles/sahara/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check sahara containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/senlin/handlers/main.yml b/ansible/roles/senlin/handlers/main.yml index bdf06bf74..13b13f92e 100644 --- a/ansible/roles/senlin/handlers/main.yml +++ b/ansible/roles/senlin/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "senlin-api" service: "{{ senlin_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: "senlin-conductor" service: "{{ senlin_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: "senlin-engine" service: "{{ senlin_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: "senlin-health-manager" service: "{{ senlin_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/senlin/tasks/bootstrap_service.yml b/ansible/roles/senlin/tasks/bootstrap_service.yml index de07a1963..9195c9b7a 100644 --- a/ansible/roles/senlin/tasks/bootstrap_service.yml +++ b/ansible/roles/senlin/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: senlin_api: "{{ senlin_services['senlin-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/senlin/tasks/check-containers.yml b/ansible/roles/senlin/tasks/check-containers.yml index 0fcaa54a2..0edf5be91 100644 --- a/ansible/roles/senlin/tasks/check-containers.yml +++ b/ansible/roles/senlin/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check senlin containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/service-images-pull/tasks/main.yml b/ansible/roles/service-images-pull/tasks/main.yml index aa0102d08..fbb9e8b8b 100644 --- a/ansible/roles/service-images-pull/tasks/main.yml +++ b/ansible/roles/service-images-pull/tasks/main.yml @@ -3,7 +3,7 @@ vars: service: "{{ item.value }}" become: true - kolla_docker: + kolla_container: action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ service.image }}" diff --git a/ansible/roles/service-stop/tasks/main.yml b/ansible/roles/service-stop/tasks/main.yml index c8e5604c6..54265ed41 100644 --- a/ansible/roles/service-stop/tasks/main.yml +++ b/ansible/roles/service-stop/tasks/main.yml @@ -3,7 +3,7 @@ vars: service: "{{ item.value }}" become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/skyline/handlers/main.yml b/ansible/roles/skyline/handlers/main.yml index d9b83cb76..9acf7bd55 100644 --- a/ansible/roles/skyline/handlers/main.yml +++ b/ansible/roles/skyline/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "skyline-apiserver" service: "{{ skyline_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: "skyline-console" service: "{{ skyline_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/skyline/tasks/bootstrap_service.yml b/ansible/roles/skyline/tasks/bootstrap_service.yml index ae842a317..61831b2c3 100644 --- a/ansible/roles/skyline/tasks/bootstrap_service.yml +++ b/ansible/roles/skyline/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: skyline_apiserver: "{{ skyline_services['skyline-apiserver'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/skyline/tasks/check-containers.yml b/ansible/roles/skyline/tasks/check-containers.yml index f70cb8748..1ece87d60 100644 --- a/ansible/roles/skyline/tasks/check-containers.yml +++ b/ansible/roles/skyline/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check skyline container become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/solum/handlers/main.yml b/ansible/roles/solum/handlers/main.yml index c60c27d22..35e802472 100644 --- a/ansible/roles/solum/handlers/main.yml +++ b/ansible/roles/solum/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "solum-api" service: "{{ solum_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: "solum-worker" service: "{{ solum_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: "solum-deployer" service: "{{ solum_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: "solum-conductor" service: "{{ solum_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/solum/tasks/bootstrap_service.yml b/ansible/roles/solum/tasks/bootstrap_service.yml index c15a3db48..5f8a1676e 100644 --- a/ansible/roles/solum/tasks/bootstrap_service.yml +++ b/ansible/roles/solum/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: solum_api: "{{ solum_services['solum-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/solum/tasks/check-containers.yml b/ansible/roles/solum/tasks/check-containers.yml index 42772b646..f8c11f0bc 100644 --- a/ansible/roles/solum/tasks/check-containers.yml +++ b/ansible/roles/solum/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check solum containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/swift/tasks/legacy_upgrade.yml b/ansible/roles/swift/tasks/legacy_upgrade.yml index e07726eff..f3d1fcb01 100644 --- a/ansible/roles/swift/tasks/legacy_upgrade.yml +++ b/ansible/roles/swift/tasks/legacy_upgrade.yml @@ -6,7 +6,7 @@ # containers or we get a conflict when attempting to start the new ones. - name: "Cleaning out old Swift containers" become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" name: "{{ item }}" action: "stop_container" diff --git a/ansible/roles/swift/tasks/pull.yml b/ansible/roles/swift/tasks/pull.yml index 622c62276..b93f86257 100644 --- a/ansible/roles/swift/tasks/pull.yml +++ b/ansible/roles/swift/tasks/pull.yml @@ -1,7 +1,7 @@ --- - name: Pulling rsyncd image become: true - kolla_docker: + kolla_container: action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ swift_rsyncd_image_full }}" @@ -15,7 +15,7 @@ - name: Pulling swift-proxy-server image become: true - kolla_docker: + kolla_container: action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ swift_proxy_server_image_full }}" @@ -27,7 +27,7 @@ - name: Pulling swift-account image become: true - kolla_docker: + kolla_container: action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ swift_account_image_full }}" @@ -39,7 +39,7 @@ - name: Pulling swift-container image become: true - kolla_docker: + kolla_container: action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ swift_container_image_full }}" @@ -51,7 +51,7 @@ - name: Pulling swift-object image become: true - kolla_docker: + kolla_container: action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ swift_object_image_full }}" @@ -63,7 +63,7 @@ - name: Pulling swift-object-expirer image become: true - kolla_docker: + kolla_container: action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ swift_object_expirer_image_full }}" diff --git a/ansible/roles/swift/tasks/reconfigure.yml b/ansible/roles/swift/tasks/reconfigure.yml index 4b302c531..d3c70e83f 100644 --- a/ansible/roles/swift/tasks/reconfigure.yml +++ b/ansible/roles/swift/tasks/reconfigure.yml @@ -31,7 +31,7 @@ - name: Ensuring the containers up become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" name: "{{ item.name }}" action: "get_container_state" @@ -58,7 +58,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" @@ -69,7 +69,7 @@ - name: Remove the containers become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" name: "{{ item[0]['name'] }}" action: "remove_container" @@ -90,7 +90,7 @@ - name: Restart containers become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" name: "{{ item[0]['name'] }}" action: "restart_container" diff --git a/ansible/roles/swift/tasks/rolling_upgrade.yml b/ansible/roles/swift/tasks/rolling_upgrade.yml index 42683ec81..1af79c1fb 100644 --- a/ansible/roles/swift/tasks/rolling_upgrade.yml +++ b/ansible/roles/swift/tasks/rolling_upgrade.yml @@ -30,7 +30,7 @@ # rolling upgrade will be finished. - name: Gracefully shutdown swift services in storage nodes become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" action: "stop_container" name: "{{ item.name }}" @@ -48,7 +48,7 @@ - name: Gracefully shutdown swift proxy services in proxy nodes become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" action: "stop_container" name: "swift_proxy_server" @@ -56,7 +56,7 @@ - name: Start new swift proxy server container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_proxy_server_image_full }}" diff --git a/ansible/roles/swift/tasks/start.yml b/ansible/roles/swift/tasks/start.yml index 7848e4d4f..82771d0f1 100644 --- a/ansible/roles/swift/tasks/start.yml +++ b/ansible/roles/swift/tasks/start.yml @@ -35,7 +35,7 @@ - name: Starting swift-rsyncd container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_rsyncd_image_full }}" @@ -50,7 +50,7 @@ - name: Starting swift-account-server container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" name: "swift_account_server" @@ -64,7 +64,7 @@ - name: Starting swift-account-auditor container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_account_image_full }}" @@ -79,7 +79,7 @@ - name: Starting swift-account-replication-server container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" environment: @@ -97,7 +97,7 @@ - name: Starting swift-account-replicator container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" environment: @@ -114,7 +114,7 @@ - name: Starting swift-account-reaper container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_account_image_full }}" @@ -128,7 +128,7 @@ - name: Starting swift-container-server container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_container_image_full }}" @@ -142,7 +142,7 @@ - name: Starting swift-container-auditor container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_container_image_full }}" @@ -157,7 +157,7 @@ - name: Starting swift-container-replication-server container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" environment: @@ -175,7 +175,7 @@ - name: Starting swift-container-replicator container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" environment: @@ -192,7 +192,7 @@ - name: Starting swift-container-updater container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_container_image_full }}" @@ -207,7 +207,7 @@ - name: Starting swift-object-server container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_object_image_full }}" @@ -222,7 +222,7 @@ - name: Starting swift-object-auditor container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_object_image_full }}" @@ -237,7 +237,7 @@ - name: Starting swift-object-replication-server container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" environment: @@ -255,7 +255,7 @@ - name: Starting swift-object-replicator container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" environment: @@ -272,7 +272,7 @@ - name: Starting swift-object-updater container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_object_image_full }}" @@ -287,7 +287,7 @@ - name: Starting swift-object-expirer container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_object_expirer_image_full }}" @@ -302,7 +302,7 @@ - name: Starting swift-proxy-server container become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" image: "{{ swift_proxy_server_image_full }}" diff --git a/ansible/roles/swift/tasks/stop.yml b/ansible/roles/swift/tasks/stop.yml index 39fe0329a..ae3b39fe3 100644 --- a/ansible/roles/swift/tasks/stop.yml +++ b/ansible/roles/swift/tasks/stop.yml @@ -1,7 +1,7 @@ --- - name: Stopping swift-rsyncd container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_rsyncd" @@ -12,7 +12,7 @@ - name: Stopping swift-account-server container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_account_server" @@ -22,7 +22,7 @@ - name: Stopping swift-account-auditor container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_account_auditor" @@ -32,7 +32,7 @@ - name: Stopping swift-account-replicator container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_account_replicator" @@ -42,7 +42,7 @@ - name: Stopping swift-account-reaper container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_account_reaper" @@ -52,7 +52,7 @@ - name: Stopping swift-container-server container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_container_server" @@ -62,7 +62,7 @@ - name: Stopping swift-container-auditor container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_container_auditor" @@ -72,7 +72,7 @@ - name: Stopping swift-container-replicator container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_container_replicator" @@ -82,7 +82,7 @@ - name: Stopping swift-container-updater container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_container_updater" @@ -92,7 +92,7 @@ - name: Stopping swift-object-server container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_object_server" @@ -102,7 +102,7 @@ - name: Stopping swift-object-auditor container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_object_auditor" @@ -112,7 +112,7 @@ - name: Stopping swift-object-replicator container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_object_replicator" @@ -122,7 +122,7 @@ - name: Stopping swift-object-updater container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_object_updater" @@ -132,7 +132,7 @@ - name: Stopping swift-object-expirer container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_object_expirer" @@ -142,7 +142,7 @@ - name: Stopping swift-proxy-server container become: true - kolla_docker: + kolla_container: action: "stop_container" common_options: "{{ docker_common_options }}" name: "swift_proxy_server" diff --git a/ansible/roles/tacker/handlers/main.yml b/ansible/roles/tacker/handlers/main.yml index 9976ad07e..3bbc16207 100644 --- a/ansible/roles/tacker/handlers/main.yml +++ b/ansible/roles/tacker/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "tacker-conductor" service: "{{ tacker_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: "tacker-server" service: "{{ tacker_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/tacker/tasks/bootstrap_service.yml b/ansible/roles/tacker/tasks/bootstrap_service.yml index fab805b17..7075bd44f 100644 --- a/ansible/roles/tacker/tasks/bootstrap_service.yml +++ b/ansible/roles/tacker/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: tacker_server: "{{ tacker_services['tacker-server'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/tacker/tasks/check-containers.yml b/ansible/roles/tacker/tasks/check-containers.yml index e33907d72..e6e009979 100644 --- a/ansible/roles/tacker/tasks/check-containers.yml +++ b/ansible/roles/tacker/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check tacker container become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" action: "compare_container" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/tacker/tasks/upgrade.yml b/ansible/roles/tacker/tasks/upgrade.yml index a1211451d..afeb387dd 100644 --- a/ansible/roles/tacker/tasks/upgrade.yml +++ b/ansible/roles/tacker/tasks/upgrade.yml @@ -13,7 +13,7 @@ service_name: "tacker-conductor" service: "{{ tacker_services[service_name] }}" become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" action: "stop_and_remove_container" name: "{{ service.container_name }}" @@ -25,7 +25,7 @@ service_name: "tacker-server" service: "{{ tacker_services[service_name] }}" become: true - kolla_docker: + kolla_container: common_options: "{{ docker_common_options }}" action: "stop_and_remove_container" name: "{{ service.container_name }}" diff --git a/ansible/roles/telegraf/handlers/main.yml b/ansible/roles/telegraf/handlers/main.yml index 01b85a27f..6e67255b9 100644 --- a/ansible/roles/telegraf/handlers/main.yml +++ b/ansible/roles/telegraf/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "telegraf" service: "{{ telegraf_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/telegraf/tasks/check-containers.yml b/ansible/roles/telegraf/tasks/check-containers.yml index 744a7bb39..7feb227d6 100644 --- a/ansible/roles/telegraf/tasks/check-containers.yml +++ b/ansible/roles/telegraf/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check telegraf containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/trove/handlers/main.yml b/ansible/roles/trove/handlers/main.yml index 245a1858f..85254f970 100644 --- a/ansible/roles/trove/handlers/main.yml +++ b/ansible/roles/trove/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "trove-api" service: "{{ trove_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: "trove-conductor" service: "{{ trove_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: "trove-taskmanager" service: "{{ trove_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/trove/tasks/bootstrap_service.yml b/ansible/roles/trove/tasks/bootstrap_service.yml index 2ea8bc80f..74766ed07 100644 --- a/ansible/roles/trove/tasks/bootstrap_service.yml +++ b/ansible/roles/trove/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: trove_api: "{{ trove_services['trove-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/trove/tasks/check-containers.yml b/ansible/roles/trove/tasks/check-containers.yml index 3c4cbd8f4..d2a1cb2a6 100644 --- a/ansible/roles/trove/tasks/check-containers.yml +++ b/ansible/roles/trove/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check trove containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/venus/handlers/main.yml b/ansible/roles/venus/handlers/main.yml index f1b17b7fe..34602a0a4 100644 --- a/ansible/roles/venus/handlers/main.yml +++ b/ansible/roles/venus/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "venus-api" service: "{{ venus_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: "venus-manager" service: "{{ venus_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/venus/tasks/check-containers.yml b/ansible/roles/venus/tasks/check-containers.yml index c89532036..63da45567 100644 --- a/ansible/roles/venus/tasks/check-containers.yml +++ b/ansible/roles/venus/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check venus containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/venus/tasks/pull.yml b/ansible/roles/venus/tasks/pull.yml index 7961b9640..5c2d03b7d 100644 --- a/ansible/roles/venus/tasks/pull.yml +++ b/ansible/roles/venus/tasks/pull.yml @@ -1,7 +1,7 @@ --- - name: Pulling venus images become: true - kolla_docker: + kolla_container: action: "pull_image" common_options: "{{ docker_common_options }}" image: "{{ item.value.image }}" diff --git a/ansible/roles/vitrage/handlers/main.yml b/ansible/roles/vitrage/handlers/main.yml index 50cdf2aaa..47327f4d9 100644 --- a/ansible/roles/vitrage/handlers/main.yml +++ b/ansible/roles/vitrage/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "vitrage-api" service: "{{ vitrage_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: "vitrage-notifier" service: "{{ vitrage_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: "vitrage-graph" service: "{{ vitrage_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: "vitrage-ml" service: "{{ vitrage_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: "vitrage-persistor" service: "{{ vitrage_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/vitrage/tasks/bootstrap_service.yml b/ansible/roles/vitrage/tasks/bootstrap_service.yml index 3cce9b8a8..6994ba741 100644 --- a/ansible/roles/vitrage/tasks/bootstrap_service.yml +++ b/ansible/roles/vitrage/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: vitrage_api: "{{ vitrage_services['vitrage-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/vitrage/tasks/check-containers.yml b/ansible/roles/vitrage/tasks/check-containers.yml index 5840a7335..1175b1ad9 100644 --- a/ansible/roles/vitrage/tasks/check-containers.yml +++ b/ansible/roles/vitrage/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check vitrage containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/watcher/handlers/main.yml b/ansible/roles/watcher/handlers/main.yml index 89fe153c4..b41b24d44 100644 --- a/ansible/roles/watcher/handlers/main.yml +++ b/ansible/roles/watcher/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "watcher-applier" service: "{{ watcher_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: "watcher-engine" service: "{{ watcher_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: "watcher-api" service: "{{ watcher_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/watcher/tasks/bootstrap_service.yml b/ansible/roles/watcher/tasks/bootstrap_service.yml index f2e902940..36a72f383 100644 --- a/ansible/roles/watcher/tasks/bootstrap_service.yml +++ b/ansible/roles/watcher/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: watcher_api: "{{ watcher_services['watcher-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/watcher/tasks/check-containers.yml b/ansible/roles/watcher/tasks/check-containers.yml index 1c20ba4d6..1af099abb 100644 --- a/ansible/roles/watcher/tasks/check-containers.yml +++ b/ansible/roles/watcher/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check watcher containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/ansible/roles/zun/handlers/main.yml b/ansible/roles/zun/handlers/main.yml index e1f31f909..5c5789538 100644 --- a/ansible/roles/zun/handlers/main.yml +++ b/ansible/roles/zun/handlers/main.yml @@ -4,7 +4,7 @@ service_name: "zun-api" service: "{{ zun_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -23,7 +23,7 @@ service_name: "zun-wsproxy" service: "{{ zun_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: "zun-compute" service: "{{ zun_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" @@ -61,7 +61,7 @@ service_name: "zun-cni-daemon" service: "{{ zun_services[service_name] }}" become: true - kolla_docker: + kolla_container: action: "recreate_or_restart_container" common_options: "{{ docker_common_options }}" name: "{{ service.container_name }}" diff --git a/ansible/roles/zun/tasks/bootstrap_service.yml b/ansible/roles/zun/tasks/bootstrap_service.yml index dae0ca2db..d618b07c2 100644 --- a/ansible/roles/zun/tasks/bootstrap_service.yml +++ b/ansible/roles/zun/tasks/bootstrap_service.yml @@ -3,7 +3,7 @@ vars: zun_api: "{{ zun_services['zun-api'] }}" become: true - kolla_docker: + kolla_container: action: "start_container" common_options: "{{ docker_common_options }}" detach: False diff --git a/ansible/roles/zun/tasks/check-containers.yml b/ansible/roles/zun/tasks/check-containers.yml index b6576eb20..4f7489c90 100644 --- a/ansible/roles/zun/tasks/check-containers.yml +++ b/ansible/roles/zun/tasks/check-containers.yml @@ -1,7 +1,7 @@ --- - name: Check zun containers become: true - kolla_docker: + kolla_container: action: "compare_container" common_options: "{{ docker_common_options }}" name: "{{ item.value.container_name }}" diff --git a/doc/source/contributor/running-tests.rst b/doc/source/contributor/running-tests.rst index d5f4e6694..8dadda695 100644 --- a/doc/source/contributor/running-tests.rst +++ b/doc/source/contributor/running-tests.rst @@ -68,25 +68,25 @@ directory use: tox -e py38 kolla-ansible.tests To run the tests of a specific file -``kolla-ansible/tests/test_kolla_docker.py``: +``kolla-ansible/tests/test_kolla_container.py``: .. code-block:: console - tox -e py38 test_kolla_docker + tox -e py38 test_kolla_container To run the tests in the ``ModuleArgsTest`` class in -the ``kolla-ansible/tests/test_kolla_docker.py`` file: +the ``kolla-ansible/tests/test_kolla_container.py`` file: .. code-block:: console - tox -e py38 test_kolla_docker.ModuleArgsTest + tox -e py38 test_kolla_container.ModuleArgsTest To run the ``ModuleArgsTest.test_module_args`` test method in -the ``kolla-ansible/tests/test_kolla_docker.py`` file: +the ``kolla-ansible/tests/test_kolla_container.py`` file: .. code-block:: console - tox -e py38 test_kolla_docker.ModuleArgsTest.test_module_args + tox -e py38 test_kolla_container.ModuleArgsTest.test_module_args Debugging unit tests -------------------- diff --git a/releasenotes/notes/rename-kolla-docker-b2d1b9fda4b91d26.yaml b/releasenotes/notes/rename-kolla-docker-b2d1b9fda4b91d26.yaml new file mode 100644 index 000000000..540c6126a --- /dev/null +++ b/releasenotes/notes/rename-kolla-docker-b2d1b9fda4b91d26.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Since kolla-ansible now also supports Podman, ansible module + kolla_docker has been renamed to kolla_container. diff --git a/tests/kolla_docker_tests/__init__.py b/tests/kolla_container_tests/__init__.py index e69de29bb..e69de29bb 100644 --- a/tests/kolla_docker_tests/__init__.py +++ b/tests/kolla_container_tests/__init__.py diff --git a/tests/kolla_docker_tests/test_docker_worker.py b/tests/kolla_container_tests/test_docker_worker.py index 550882e88..7c7909e6a 100644 --- a/tests/kolla_docker_tests/test_docker_worker.py +++ b/tests/kolla_container_tests/test_docker_worker.py @@ -28,11 +28,11 @@ sys.modules['dbus'] = mock.MagicMock() this_dir = os.path.dirname(sys.modules[__name__].__file__) ansible_dir = os.path.join(this_dir, '..', '..', 'ansible') -kolla_docker_file = os.path.join(ansible_dir, - 'library', 'kolla_docker.py') +kolla_container_file = os.path.join(ansible_dir, + 'library', 'kolla_container.py') docker_worker_file = os.path.join(ansible_dir, 'module_utils', 'kolla_docker_worker.py') -kd = imp.load_source('kolla_docker', kolla_docker_file) +kc = imp.load_source('kolla_container', kolla_container_file) dwm = imp.load_source('kolla_docker_worker', docker_worker_file) @@ -212,20 +212,20 @@ class TestMainModule(base.BaseTestCase): self.fake_data_common_opts['params']['common_options'] = \ FAKE_DATA_COMMON_OPTS - @mock.patch("kolla_docker.traceback.format_exc") + @mock.patch("kolla_container.traceback.format_exc") @mock.patch("kolla_docker_worker.get_docker_client") - @mock.patch("kolla_docker.generate_module") + @mock.patch("kolla_container.generate_module") def test_docker_client_exception(self, mock_generate_module, mock_dclient, mock_traceback): module_mock = mock.MagicMock() mock_generate_module.return_value = module_mock mock_dclient.side_effect = AttributeError() mock_traceback.return_value = "Some very ugly traceback" - kd.main() + kc.main() module_mock.fail_json.assert_called_once_with( changed=True, msg=repr("Some very ugly traceback")) - @mock.patch("kolla_docker.generate_module") + @mock.patch("kolla_container.generate_module") def test_execute_module(self, mock_generate_module): module_mock = mock.MagicMock() module_mock.params = self.fake_data['params'] @@ -237,7 +237,7 @@ class TestMainModule(base.BaseTestCase): mock_dw.return_value.check_image.return_value = False mock_dw.return_value.changed = False mock_dw.return_value.result = {"some_key": "some_value"} - kd.main() + kc.main() mock_dw.assert_called_once_with(module_mock) mock_dw.return_value.check_image.assert_called_once_with() module_mock.exit_json.assert_called_once_with(changed=False, diff --git a/tests/kolla_docker_tests/test_podman_worker.py b/tests/kolla_container_tests/test_podman_worker.py index 7f8ca6b80..6767a9100 100644 --- a/tests/kolla_docker_tests/test_podman_worker.py +++ b/tests/kolla_container_tests/test_podman_worker.py @@ -27,11 +27,11 @@ sys.modules['dbus'] = mock.MagicMock() this_dir = os.path.dirname(sys.modules[__name__].__file__) ansible_dir = os.path.join(this_dir, '..', '..', 'ansible') -kolla_docker_file = os.path.join(ansible_dir, - 'library', 'kolla_docker.py') +kolla_container_file = os.path.join(ansible_dir, + 'library', 'kolla_container.py') podman_worker_file = os.path.join(ansible_dir, 'module_utils', 'kolla_podman_worker.py') -kd = imp.load_source('kolla_docker', kolla_docker_file) +kc = imp.load_source('kolla_container', kolla_container_file) pwm = imp.load_source('kolla_podman_worker', podman_worker_file) FAKE_DATA = { @@ -165,7 +165,7 @@ class TestMainModule(base.BaseTestCase): super(TestMainModule, self).setUp() self.fake_data = copy.deepcopy(FAKE_DATA) - @mock.patch("kolla_docker.generate_module") + @mock.patch("kolla_container.generate_module") def test_execute_module(self, mock_generate_module): module_mock = mock.MagicMock() module_mock.params = self.fake_data['params'] @@ -177,7 +177,7 @@ class TestMainModule(base.BaseTestCase): mock_pw.return_value.check_image.return_value = False mock_pw.return_value.changed = False mock_pw.return_value.result = {"some_key": "some_value"} - kd.main() + kc.main() mock_pw.assert_called_once_with(module_mock) mock_pw.return_value.check_image.assert_called_once_with() module_mock.exit_json.assert_called_once_with(changed=False, diff --git a/tests/kolla_docker_tests/test_systemd.py b/tests/kolla_container_tests/test_systemd.py index 9f2b624f0..9f2b624f0 100644 --- a/tests/kolla_docker_tests/test_systemd.py +++ b/tests/kolla_container_tests/test_systemd.py diff --git a/tests/test_kolla_docker.py b/tests/test_kolla_container.py index 2d398d5cb..0fe257bd0 100644 --- a/tests/test_kolla_docker.py +++ b/tests/test_kolla_container.py @@ -24,11 +24,11 @@ from oslotest import base this_dir = os.path.dirname(sys.modules[__name__].__file__) ansible_dir = os.path.join(this_dir, '..', 'ansible') -kolla_docker_file = os.path.join(ansible_dir, - 'library', 'kolla_docker.py') +kolla_container_file = os.path.join(ansible_dir, + 'library', 'kolla_container.py') docker_worker_file = os.path.join(ansible_dir, 'module_utils', 'kolla_docker_worker.py') -kd = imp.load_source('kolla_docker', kolla_docker_file) +kc = imp.load_source('kolla_container', kolla_container_file) dwm = imp.load_source('kolla_docker_worker', docker_worker_file) @@ -122,9 +122,9 @@ class ModuleArgsTest(base.BaseTestCase): ['action', 'stop_and_remove_container', ['name']], ] - kd.AnsibleModule = mock.MagicMock() - kd.generate_module() - kd.AnsibleModule.assert_called_with( + kc.AnsibleModule = mock.MagicMock() + kc.generate_module() + kc.AnsibleModule.assert_called_with( argument_spec=argument_spec, required_if=required_if, bypass_checks=False diff --git a/tools/validate-all-file.py b/tools/validate-all-file.py index 0b6007053..17eb6a854 100755 --- a/tools/validate-all-file.py +++ b/tools/validate-all-file.py @@ -169,18 +169,18 @@ def check_task_contents(): if task.get('block'): block = task for task in task['block']: - if check_docker_become(fullpath, task, block): + if check_container_become(fullpath, task, block): return_code = 1 else: - if check_docker_become(fullpath, task): + if check_container_become(fullpath, task): return_code = 1 return return_code -def check_docker_become(fullpath, task, block=''): +def check_container_become(fullpath, task, block=''): - ce_modules = ('kolla_docker', 'kolla_container_facts', 'kolla_toolbox') + ce_modules = ('kolla_container', 'kolla_container_facts', 'kolla_toolbox') cmd_modules = ('command', 'shell') return_code = 0 |