openstack/kolla-ansible
Code Issues Proposed changes

Merge "Karbor services restarting issue on conf update"

Browse Source
This commit is contained in:
Jenkins 2017-04-07 08:44:19 +00:00 committed by Gerrit Code Review
commit 5869030d7f
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/karbor/handlers/main.yml
View File

@ -18,7 +18,6 @@
- service.enabled | bool
- config_json.changed | bool
or karbor_conf.changed | bool
or openstack_infra_conf.changed | bool
or karbor_api_container.changed | bool
- name: Restart karbor-protection container
@ -62,5 +61,4 @@
- service.enabled | bool
- config_json.changed | bool
or karbor_conf.changed | bool
or openstack_infra_conf.changed | bool
or karbor_operationengine_container.changed | bool

12
ansible/roles/karbor/tasks/config.yml
View File

@ -48,19 +48,17 @@
- name: Copying over openstack-infra.conf
vars:
service: "{{ item.key }}"
service_name: 'karbor-protection'
service: "{{ karbor_services[service_name] }}"
template:
src: "providers.d/openstack-infra.conf.j2"
dest: "{{ node_config_directory }}/{{ item.key }}/providers.d/openstack-infra.conf"
dest: "{{ node_config_directory }}/{{ service_name }}/providers.d/openstack-infra.conf"
register: openstack_infra_conf
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ karbor_services }}"
- inventory_hostname in groups[service.group]
- service.enabled | bool
notify:
- Restart karbor-api container
- Restart karbor-protection container
- Restart karbor-operationengine container
- name: Check karbor containers
kolla_docker: