From 4bdb0f3570eb7813e2356f91ee3ef76eb27bd80e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E6=B0=B8=E5=90=9B?= <bai.yongjun@99cloud.net>
Date: Mon, 1 Apr 2019 16:38:34 +0800
Subject: [PATCH] Change action to kolla_action
the action show be kolla_action in kolla-ansible/cyborg
Closes-bug: #1822555
Change-Id: I3dd909ae785dd43d5faabbc3fdd5f8bb8aca370b
---
ansible/roles/cyborg/handlers/main.yml | 6 +++---
ansible/roles/cyborg/tasks/config.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/cyborg/handlers/main.yml b/ansible/roles/cyborg/handlers/main.yml
index 0453191629..ea0bb2093c 100644
--- a/ansible/roles/cyborg/handlers/main.yml
+++ b/ansible/roles/cyborg/handlers/main.yml
@@ -15,7 +15,7 @@
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- - action != "config"
+ - kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@@ -39,7 +39,7 @@
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- - action != "config"
+ - kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
@@ -63,7 +63,7 @@
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
when:
- - action != "config"
+ - kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
diff --git a/ansible/roles/cyborg/tasks/config.yml b/ansible/roles/cyborg/tasks/config.yml
index 326317e4d3..ea8e29df23 100644
--- a/ansible/roles/cyborg/tasks/config.yml
+++ b/ansible/roles/cyborg/tasks/config.yml
@@ -118,7 +118,7 @@
dimensions: "{{ item.value.dimensions }}"
register: check_cyborg_containers
when:
- - action != "config"
+ - kolla_action != "config"
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ cyborg_services }}"