From e05491bcd6d75cc204c3d15e3422ad37532c923a Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Mon, 27 Mar 2017 17:47:35 +0200 Subject: [PATCH] Fix Telegraf role reconfigure action During "Optimize reconfigure action for Telegraf" previous commit, a regression has been introduced on the "reconfigure" action. https://review.openstack.org/#/c/424202/ The start.yml file has been deleted but reconfigure.yml still using it. This patch fix it. Change-Id: I8879b83ce7a1f886f6870d79f63c3f1cc706059b Closes-Bug: #1676403 --- ansible/roles/telegraf/tasks/reconfigure.yml | 42 +------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/ansible/roles/telegraf/tasks/reconfigure.yml b/ansible/roles/telegraf/tasks/reconfigure.yml index 68a27d8a57..e078ef1318 100644 --- a/ansible/roles/telegraf/tasks/reconfigure.yml +++ b/ansible/roles/telegraf/tasks/reconfigure.yml @@ -1,42 +1,2 @@ --- -- name: Ensuring the containers up - kolla_docker: - name: "telegraf" - action: "get_container_state" - register: container_state - failed_when: container_state.Running == false - -- include: config.yml - -- name: Check the configs - command: docker exec telegraf /usr/local/bin/kolla_set_configs --check - changed_when: false - failed_when: false - register: check_results - -# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS' -# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE', -# just remove the container and start again -- name: Containers config strategy - kolla_docker: - name: "telegraf" - action: "get_container_env" - register: container_envs - -- name: Remove the containers - kolla_docker: - name: "telegraf" - action: "remove_container" - register: remove_containers - when: - - config_strategy == "COPY_ONCE" - -- include: start.yml - when: remove_containers.changed - -- name: Restart containers - kolla_docker: - name: "telegraf" - action: "restart_container" - when: - - config_strategy == 'COPY_ALWAYS' +- include: deploy.yml