diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-04 14:36:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-04 14:36:47 +0000 |
| commit | 7ab6def355a9ed1cd43af9b7b135c9fa722c4703 (patch) | |
| tree | 914c7dce8c39659681b34db4e408d71d068a5bd8 | |
| parent | b5ffb450e655ad38c05e25a66eff18b9c639263f (diff) | |
| parent | b950fe23831452637977def2d6b0c43aea4e43df (diff) | |
| download | kolla-7ab6def355a9ed1cd43af9b7b135c9fa722c4703.tar.gz kolla-7ab6def355a9ed1cd43af9b7b135c9fa722c4703.zip | |
Merge "Add reconfigure for heka"
| -rw-r--r-- | ansible/roles/common/tasks/do_reconfigure.yml | 42 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/reconfigure.yml | 2 |
2 files changed, 44 insertions, 0 deletions
diff --git a/ansible/roles/common/tasks/do_reconfigure.yml b/ansible/roles/common/tasks/do_reconfigure.yml new file mode 100644 index 000000000..961c656fa --- /dev/null +++ b/ansible/roles/common/tasks/do_reconfigure.yml @@ -0,0 +1,42 @@ +--- +- name: Ensuring the heka container is up + kolla_docker: + name: "heka" + action: "get_container_state" + register: container_state + failed_when: container_state.Running == false + +- include: config.yml + +- name: Checking the heka config + command: docker exec heka /usr/local/bin/kolla_set_configs --check + changed_when: false + failed_when: false + register: check_result + +- name: Getting the heka container config strategy + kolla_docker: + name: "heka" + action: "get_container_env" + register: container_env + +- name: Removing the heka container + kolla_docker: + name: "heka" + action: "remove_container" + register: remove_container + when: + - config_strategy == "COPY_ONCE" or container_env["KOLLA_CONFIG_STRATEGY"] == "COPY_ONCE" + - check_result.rc == 1 + +- include: start.yml + when: remove_container.changed + +- name: Restarting the heka container + kolla_docker: + name: "heka" + action: "restart_container" + when: + - config_strategy == "COPY_ALWAYS" + - container_env["KOLLA_CONFIG_STRATEGY"] == "COPY_ALWAYS" + - check_result.rc == 1 diff --git a/ansible/roles/common/tasks/reconfigure.yml b/ansible/roles/common/tasks/reconfigure.yml index ed97d539c..66933249b 100644 --- a/ansible/roles/common/tasks/reconfigure.yml +++ b/ansible/roles/common/tasks/reconfigure.yml @@ -1 +1,3 @@ --- +- include: do_reconfigure.yml + serial: "30%" |