Skip to content
Snippets Groups Projects
Commit 4a4494bc authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Specify 'become' for all tasks that use kolla_docker module"

parents ad3e99f9 30be04ea
No related branches found
No related tags found
No related merge requests found
Showing
with 32 additions and 0 deletions
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
aodh_conf: "{{ aodh_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" aodh_conf: "{{ aodh_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ aodh_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ aodh_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
aodh_api_container: "{{ check_aodh_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" aodh_api_container: "{{ check_aodh_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
aodh_conf: "{{ aodh_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" aodh_conf: "{{ aodh_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ aodh_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ aodh_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
aodh_evaluator_container: "{{ check_aodh_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" aodh_evaluator_container: "{{ check_aodh_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -54,6 +56,7 @@ ...@@ -54,6 +56,7 @@
aodh_conf: "{{ aodh_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" aodh_conf: "{{ aodh_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ aodh_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ aodh_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
aodh_listener_container: "{{ check_aodh_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" aodh_listener_container: "{{ check_aodh_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -77,6 +80,7 @@ ...@@ -77,6 +80,7 @@
aodh_conf: "{{ aodh_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" aodh_conf: "{{ aodh_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ aodh_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ aodh_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
aodh_notifier_container: "{{ check_aodh_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" aodh_notifier_container: "{{ check_aodh_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- name: Running aodh bootstrap container - name: Running aodh bootstrap container
vars: vars:
aodh_api: "{{ aodh_services['aodh-api'] }}" aodh_api: "{{ aodh_services['aodh-api'] }}"
become: true
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -104,6 +104,7 @@ ...@@ -104,6 +104,7 @@
- Restart aodh-api container - Restart aodh-api container
- name: Check aodh containers - name: Check aodh containers
become: true
kolla_docker: kolla_docker:
action: "compare_container" action: "compare_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
--- ---
- name: Pulling aodh images - name: Pulling aodh images
become: true
kolla_docker: kolla_docker:
action: "pull_image" action: "pull_image"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
barbican_conf: "{{ barbican_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" barbican_conf: "{{ barbican_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ barbican_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ barbican_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
barbican_api_container: "{{ check_barbican_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" barbican_api_container: "{{ check_barbican_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
barbican_conf: "{{ barbican_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" barbican_conf: "{{ barbican_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ barbican_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ barbican_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
barbican_keystone_listener_container: "{{ check_barbican_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" barbican_keystone_listener_container: "{{ check_barbican_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -55,6 +57,7 @@ ...@@ -55,6 +57,7 @@
barbican_conf: "{{ barbican_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" barbican_conf: "{{ barbican_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ barbican_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ barbican_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
barbican_worker_container: "{{ check_barbican_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" barbican_worker_container: "{{ check_barbican_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- name: Running barbican bootstrap container - name: Running barbican bootstrap container
vars: vars:
barbican_api: "{{ barbican_services['barbican-api'] }}" barbican_api: "{{ barbican_services['barbican-api'] }}"
become: true
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -123,6 +123,7 @@ ...@@ -123,6 +123,7 @@
- Restart {{ item.key }} container - Restart {{ item.key }} container
- name: Check barbican containers - name: Check barbican containers
become: true
kolla_docker: kolla_docker:
action: "compare_container" action: "compare_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
--- ---
- name: Pulling barbican images - name: Pulling barbican images
become: true
kolla_docker: kolla_docker:
action: "pull_image" action: "pull_image"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
--- ---
- name: Ensuring the containers up - name: Ensuring the containers up
become: true
kolla_docker: kolla_docker:
name: "{{ item.name }}" name: "{{ item.name }}"
action: "get_container_state" action: "get_container_state"
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE', # and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
# just remove the container and start again # just remove the container and start again
- name: Containers config strategy - name: Containers config strategy
become: true
kolla_docker: kolla_docker:
name: "{{ item.name }}" name: "{{ item.name }}"
action: "get_container_env" action: "get_container_env"
...@@ -33,6 +35,7 @@ ...@@ -33,6 +35,7 @@
- { name: bifrost-deploy, group: bifrost-deploy } - { name: bifrost-deploy, group: bifrost-deploy }
- name: Remove the containers - name: Remove the containers
become: true
kolla_docker: kolla_docker:
name: "{{ item[0]['name'] }}" name: "{{ item[0]['name'] }}"
action: "remove_container" action: "remove_container"
...@@ -50,6 +53,7 @@ ...@@ -50,6 +53,7 @@
when: remove_containers.changed when: remove_containers.changed
- name: Restart containers - name: Restart containers
become: true
kolla_docker: kolla_docker:
name: "{{ item[0]['name'] }}" name: "{{ item[0]['name'] }}"
action: "restart_container" action: "restart_container"
......
--- ---
- name: Starting bifrost deploy container - name: Starting bifrost deploy container
become: true
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
blazar_conf: "{{ blazar_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" blazar_conf: "{{ blazar_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ blazar_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ blazar_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
blazar_api_container: "{{ check_blazar_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" blazar_api_container: "{{ check_blazar_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
blazar_conf: "{{ blazar_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" blazar_conf: "{{ blazar_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ blazar_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ blazar_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
blazar_manager_container: "{{ check_blazar_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" blazar_manager_container: "{{ check_blazar_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- name: Running blazar bootstrap container - name: Running blazar bootstrap container
vars: vars:
blazar_api: "{{ blazar_services['blazar-api'] }}" blazar_api: "{{ blazar_services['blazar-api'] }}"
become: true
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
- Restart blazar-manager container - Restart blazar-manager container
- name: Check blazar containers - name: Check blazar containers
become: true
kolla_docker: kolla_docker:
action: "compare_container" action: "compare_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
--- ---
- name: Pulling blazar images - name: Pulling blazar images
become: true
kolla_docker: kolla_docker:
action: "pull_image" action: "pull_image"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
policy_overwriting: "{{ ceilometer_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ ceilometer_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
ceilometer_notification_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_notification_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
panko_conf: "{{ panko_confs.results|selectattr('item.key', 'equalto', service_name)|first }}" panko_conf: "{{ panko_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
ceilometer_pipeline: "{{ ceilometer_pipelines.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_pipeline: "{{ ceilometer_pipelines.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ ceilometer_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ ceilometer_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
ceilometer_central_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_central_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -61,6 +63,7 @@ ...@@ -61,6 +63,7 @@
ceilometer_pipeline: "{{ ceilometer_pipelines.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_pipeline: "{{ ceilometer_pipelines.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ ceilometer_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}" policy_overwriting: "{{ ceilometer_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
ceilometer_compute_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}" ceilometer_compute_container: "{{ check_ceilometer_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
- name: Running Ceilometer bootstrap container - name: Running Ceilometer bootstrap container
vars: vars:
ceilometer_notification: "{{ ceilometer_services['ceilometer-notification'] }}" ceilometer_notification: "{{ ceilometer_services['ceilometer-notification'] }}"
become: true
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -162,6 +162,7 @@ ...@@ -162,6 +162,7 @@
# check whether the containers parameter is changed. If yes, trigger the handler. # check whether the containers parameter is changed. If yes, trigger the handler.
- name: Check ceilometer containers - name: Check ceilometer containers
become: true
kolla_docker: kolla_docker:
action: "compare_container" action: "compare_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
--- ---
- name: Pulling ceilometer images - name: Pulling ceilometer images
become: true
kolla_docker: kolla_docker:
action: "pull_image" action: "pull_image"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
run_once: True run_once: True
- name: Creating ceph_mon_config volume - name: Creating ceph_mon_config volume
become: true
kolla_docker: kolla_docker:
action: "create_volume" action: "create_volume"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
- ceph_osd_wipe_disk != "yes-i-really-really-mean-it" - ceph_osd_wipe_disk != "yes-i-really-really-mean-it"
- name: Bootstrapping Ceph OSDs - name: Bootstrapping Ceph OSDs
become: true
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
...@@ -86,6 +87,7 @@ ...@@ -86,6 +87,7 @@
- ceph_osd_wipe_disk != "yes-i-really-really-mean-it" - ceph_osd_wipe_disk != "yes-i-really-really-mean-it"
- name: Bootstrapping Ceph Cache OSDs - name: Bootstrapping Ceph Cache OSDs
become: true
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment