Merge "fix blazar error in deployment"

This commit is contained in:
Zuul 2018-05-24 11:23:11 +00:00 committed by Gerrit Code Review
commit c100c135bd

View File

@ -5,7 +5,7 @@
service: "{{ blazar_services[service_name] }}" service: "{{ blazar_services[service_name] }}"
config_json: "{{ blazar_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" config_json: "{{ blazar_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
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_json: "{{ blazar_policy_jsons.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 }}"
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
@ -19,7 +19,7 @@
- service.enabled | bool - service.enabled | bool
- config_json.changed | bool - config_json.changed | bool
or blazar_conf.changed | bool or blazar_conf.changed | bool
or policy_json.changed | bool or policy_overwriting | bool
or blazar_api_container.changed | bool or blazar_api_container.changed | bool
- name: Restart blazar-manager container - name: Restart blazar-manager container
@ -28,7 +28,7 @@
service: "{{ blazar_services[service_name] }}" service: "{{ blazar_services[service_name] }}"
config_json: "{{ blazar_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}" config_json: "{{ blazar_config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
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_json: "{{ blazar_policy_jsons.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 }}"
kolla_docker: kolla_docker:
action: "recreate_or_restart_container" action: "recreate_or_restart_container"
@ -42,5 +42,5 @@
- service.enabled | bool - service.enabled | bool
- config_json.changed | bool - config_json.changed | bool
or blazar_conf.changed | bool or blazar_conf.changed | bool
or policy_json.changed | bool or policy_overwriting.changed | bool
or blazar_manager_container.changed | bool or blazar_manager_container.changed | bool