From c567055176648cc6e0bb4b3fd5c3a80be0374dd9 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 25 Jan 2018 11:30:32 +0800 Subject: [PATCH] Fix ansible warning - rename action and serial to kolla_ansible and kolla_serial - use become instead of "sudo " in shell - Remove quota for failed_when and changed_when in rabbitmq tasks Change-Id: I78cb60168aaa40bb6439198283546b7faf33917c Implements: blueprint migrate-to-ansible-2-2-0 --- ansible/roles/aodh/handlers/main.yml | 8 +- ansible/roles/aodh/tasks/config.yml | 2 +- ansible/roles/aodh/tasks/main.yml | 2 +- ansible/roles/barbican/handlers/main.yml | 6 +- ansible/roles/barbican/tasks/config.yml | 2 +- ansible/roles/barbican/tasks/main.yml | 2 +- ansible/roles/baremetal/tasks/main.yml | 2 +- ansible/roles/bifrost/tasks/main.yml | 2 +- ansible/roles/ceilometer/handlers/main.yml | 6 +- ansible/roles/ceilometer/tasks/config.yml | 2 +- ansible/roles/ceilometer/tasks/main.yml | 2 +- ansible/roles/ceph/tasks/main.yml | 2 +- ansible/roles/chrony/handlers/main.yml | 2 +- ansible/roles/chrony/tasks/config.yml | 2 +- ansible/roles/chrony/tasks/main.yml | 2 +- ansible/roles/cinder/handlers/main.yml | 8 +- ansible/roles/cinder/tasks/config.yml | 2 +- ansible/roles/cinder/tasks/main.yml | 2 +- ansible/roles/cloudkitty/handlers/main.yml | 4 +- ansible/roles/cloudkitty/tasks/config.yml | 2 +- ansible/roles/cloudkitty/tasks/main.yml | 2 +- ansible/roles/collectd/handlers/main.yml | 2 +- ansible/roles/collectd/tasks/config.yml | 2 +- ansible/roles/collectd/tasks/main.yml | 2 +- ansible/roles/common/handlers/main.yml | 6 +- ansible/roles/common/tasks/config.yml | 2 +- ansible/roles/common/tasks/main.yml | 2 +- ansible/roles/congress/handlers/main.yml | 6 +- ansible/roles/congress/tasks/config.yml | 2 +- ansible/roles/congress/tasks/main.yml | 2 +- ansible/roles/designate/handlers/main.yml | 14 +- ansible/roles/designate/tasks/config.yml | 2 +- ansible/roles/designate/tasks/main.yml | 2 +- ansible/roles/elasticsearch/handlers/main.yml | 2 +- ansible/roles/elasticsearch/tasks/config.yml | 2 +- ansible/roles/elasticsearch/tasks/main.yml | 2 +- ansible/roles/etcd/handlers/main.yml | 2 +- ansible/roles/etcd/tasks/config.yml | 2 +- ansible/roles/etcd/tasks/main.yml | 2 +- ansible/roles/freezer/handlers/main.yml | 2 +- ansible/roles/freezer/tasks/config.yml | 2 +- ansible/roles/freezer/tasks/main.yml | 2 +- ansible/roles/glance/handlers/main.yml | 4 +- ansible/roles/glance/tasks/config.yml | 2 +- ansible/roles/glance/tasks/main.yml | 2 +- ansible/roles/gnocchi/handlers/main.yml | 6 +- ansible/roles/gnocchi/tasks/config.yml | 2 +- ansible/roles/gnocchi/tasks/main.yml | 2 +- ansible/roles/grafana/handlers/main.yml | 2 +- ansible/roles/grafana/tasks/config.yml | 2 +- ansible/roles/grafana/tasks/main.yml | 2 +- ansible/roles/haproxy/handlers/main.yml | 6 +- ansible/roles/haproxy/tasks/config.yml | 2 +- ansible/roles/haproxy/tasks/main.yml | 2 +- ansible/roles/heat/handlers/main.yml | 6 +- ansible/roles/heat/tasks/config.yml | 2 +- ansible/roles/heat/tasks/main.yml | 2 +- ansible/roles/horizon/handlers/main.yml | 2 +- ansible/roles/horizon/tasks/config.yml | 2 +- ansible/roles/horizon/tasks/main.yml | 2 +- ansible/roles/influxdb/handlers/main.yml | 2 +- ansible/roles/influxdb/tasks/config.yml | 2 +- ansible/roles/influxdb/tasks/main.yml | 2 +- ansible/roles/ironic/tasks/main.yml | 2 +- ansible/roles/iscsi/tasks/main.yml | 2 +- ansible/roles/karbor/handlers/main.yml | 6 +- ansible/roles/karbor/tasks/config.yml | 2 +- ansible/roles/karbor/tasks/main.yml | 2 +- ansible/roles/keystone/handlers/main.yml | 10 +- ansible/roles/keystone/tasks/config.yml | 2 +- ansible/roles/keystone/tasks/main.yml | 2 +- ansible/roles/kibana/handlers/main.yml | 2 +- ansible/roles/kibana/tasks/config.yml | 2 +- ansible/roles/kibana/tasks/main.yml | 2 +- ansible/roles/kuryr/handlers/main.yml | 2 +- ansible/roles/kuryr/tasks/config.yml | 2 +- ansible/roles/kuryr/tasks/main.yml | 2 +- ansible/roles/magnum/handlers/main.yml | 4 +- ansible/roles/magnum/tasks/config.yml | 2 +- ansible/roles/magnum/tasks/main.yml | 2 +- ansible/roles/manila/handlers/main.yml | 8 +- ansible/roles/manila/tasks/config.yml | 2 +- ansible/roles/manila/tasks/main.yml | 2 +- ansible/roles/mariadb/handlers/main.yml | 8 +- ansible/roles/mariadb/tasks/config.yml | 2 +- ansible/roles/mariadb/tasks/main.yml | 2 +- ansible/roles/memcached/handlers/main.yml | 2 +- ansible/roles/memcached/tasks/config.yml | 2 +- ansible/roles/memcached/tasks/main.yml | 2 +- ansible/roles/mistral/handlers/main.yml | 6 +- ansible/roles/mistral/tasks/config.yml | 2 +- ansible/roles/mistral/tasks/main.yml | 2 +- ansible/roles/mongodb/tasks/main.yml | 2 +- ansible/roles/multipathd/tasks/main.yml | 2 +- ansible/roles/murano/tasks/main.yml | 2 +- ansible/roles/murano/tasks/start.yml | 4 +- ansible/roles/neutron/handlers/main.yml | 22 +-- .../neutron/tasks/config-neutron-fake.yml | 2 +- ansible/roles/neutron/tasks/config.yml | 2 +- ansible/roles/neutron/tasks/main.yml | 2 +- ansible/roles/nova-hyperv/tasks/main.yml | 2 +- ansible/roles/nova/handlers/main.yml | 26 ++-- ansible/roles/nova/tasks/config-nova-fake.yml | 2 +- ansible/roles/nova/tasks/config.yml | 2 +- ansible/roles/nova/tasks/main.yml | 2 +- ansible/roles/octavia/handlers/main.yml | 8 +- ansible/roles/octavia/tasks/config.yml | 2 +- ansible/roles/octavia/tasks/main.yml | 2 +- ansible/roles/opendaylight/handlers/main.yml | 2 +- ansible/roles/opendaylight/tasks/config.yml | 2 +- ansible/roles/opendaylight/tasks/main.yml | 2 +- ansible/roles/openvswitch/handlers/main.yml | 4 +- ansible/roles/openvswitch/tasks/config.yml | 2 +- ansible/roles/openvswitch/tasks/main.yml | 2 +- ansible/roles/ovs-dpdk/handlers/main.yml | 4 +- ansible/roles/ovs-dpdk/tasks/config.yml | 2 +- ansible/roles/ovs-dpdk/tasks/main.yml | 2 +- ansible/roles/panko/handlers/main.yml | 2 +- ansible/roles/panko/tasks/config.yml | 2 +- ansible/roles/panko/tasks/main.yml | 2 +- ansible/roles/prechecks/tasks/user_checks.yml | 3 +- ansible/roles/qdrouterd/handlers/main.yml | 2 +- .../roles/qdrouterd/tasks/add_sasl_user.yml | 4 +- ansible/roles/qdrouterd/tasks/config.yml | 2 +- ansible/roles/qdrouterd/tasks/main.yml | 2 +- ansible/roles/rabbitmq/handlers/main.yml | 2 +- ansible/roles/rabbitmq/tasks/config.yml | 2 +- ansible/roles/rabbitmq/tasks/main.yml | 2 +- ansible/roles/rabbitmq/tasks/upgrade.yml | 4 +- ansible/roles/rally/handlers/main.yml | 2 +- ansible/roles/rally/tasks/config.yml | 2 +- ansible/roles/rally/tasks/main.yml | 2 +- ansible/roles/redis/handlers/main.yml | 4 +- ansible/roles/redis/tasks/config.yml | 2 +- ansible/roles/redis/tasks/main.yml | 2 +- ansible/roles/sahara/handlers/main.yml | 4 +- ansible/roles/sahara/tasks/config.yml | 2 +- ansible/roles/sahara/tasks/main.yml | 2 +- ansible/roles/searchlight/handlers/main.yml | 4 +- ansible/roles/searchlight/tasks/config.yml | 2 +- ansible/roles/searchlight/tasks/main.yml | 2 +- ansible/roles/senlin/handlers/main.yml | 4 +- ansible/roles/senlin/tasks/config.yml | 2 +- ansible/roles/senlin/tasks/main.yml | 2 +- ansible/roles/skydive/handlers/main.yml | 4 +- ansible/roles/skydive/tasks/config.yml | 2 +- ansible/roles/skydive/tasks/main.yml | 2 +- ansible/roles/solum/handlers/main.yml | 8 +- ansible/roles/solum/tasks/config.yml | 2 +- ansible/roles/solum/tasks/main.yml | 2 +- ansible/roles/swift/tasks/main.yml | 2 +- ansible/roles/tacker/handlers/main.yml | 4 +- ansible/roles/tacker/tasks/config.yml | 2 +- ansible/roles/tacker/tasks/main.yml | 2 +- ansible/roles/telegraf/handlers/main.yml | 2 +- ansible/roles/telegraf/tasks/config.yml | 2 +- ansible/roles/telegraf/tasks/main.yml | 2 +- ansible/roles/tempest/handlers/main.yml | 2 +- ansible/roles/tempest/tasks/config.yml | 2 +- ansible/roles/tempest/tasks/main.yml | 2 +- ansible/roles/trove/handlers/main.yml | 6 +- ansible/roles/trove/tasks/config.yml | 2 +- ansible/roles/trove/tasks/main.yml | 2 +- ansible/roles/vitrage/handlers/main.yml | 10 +- ansible/roles/vitrage/tasks/config.yml | 2 +- ansible/roles/vitrage/tasks/main.yml | 2 +- ansible/roles/vmtp/handlers/main.yml | 2 +- ansible/roles/vmtp/tasks/config.yml | 2 +- ansible/roles/vmtp/tasks/main.yml | 2 +- ansible/roles/watcher/handlers/main.yml | 6 +- ansible/roles/watcher/tasks/config.yml | 2 +- ansible/roles/watcher/tasks/main.yml | 2 +- ansible/roles/zun/handlers/main.yml | 4 +- ansible/roles/zun/tasks/config.yml | 2 +- ansible/roles/zun/tasks/main.yml | 2 +- ansible/site.yml | 128 +++++++++--------- .../fix-ansible-warning-f9b382a13446f625.yaml | 5 + tools/kolla-ansible | 22 +-- 178 files changed, 347 insertions(+), 341 deletions(-) create mode 100644 releasenotes/notes/fix-ansible-warning-f9b382a13446f625.yaml diff --git a/ansible/roles/aodh/handlers/main.yml b/ansible/roles/aodh/handlers/main.yml index 154258b86a..3e897671b4 100644 --- a/ansible/roles/aodh/handlers/main.yml +++ b/ansible/roles/aodh/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -38,7 +38,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -61,7 +61,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -84,7 +84,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml index b4dde7d3ba..c5fb9523d6 100644 --- a/ansible/roles/aodh/tasks/config.yml +++ b/ansible/roles/aodh/tasks/config.yml @@ -112,7 +112,7 @@ volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" register: check_aodh_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ aodh_services }}" diff --git a/ansible/roles/aodh/tasks/main.yml b/ansible/roles/aodh/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/aodh/tasks/main.yml +++ b/ansible/roles/aodh/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/barbican/handlers/main.yml b/ansible/roles/barbican/handlers/main.yml index f34dd8f074..90f1080ed2 100644 --- a/ansible/roles/barbican/handlers/main.yml +++ b/ansible/roles/barbican/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -39,7 +39,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -62,7 +62,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/barbican/tasks/config.yml b/ansible/roles/barbican/tasks/config.yml index ce971d3c97..a9dd04395b 100644 --- a/ansible/roles/barbican/tasks/config.yml +++ b/ansible/roles/barbican/tasks/config.yml @@ -131,7 +131,7 @@ volumes: "{{ item.value.volumes }}" register: check_barbican_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ barbican_services }}" diff --git a/ansible/roles/barbican/tasks/main.yml b/ansible/roles/barbican/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/barbican/tasks/main.yml +++ b/ansible/roles/barbican/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/baremetal/tasks/main.yml b/ansible/roles/baremetal/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/baremetal/tasks/main.yml +++ b/ansible/roles/baremetal/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/bifrost/tasks/main.yml b/ansible/roles/bifrost/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/bifrost/tasks/main.yml +++ b/ansible/roles/bifrost/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ceilometer/handlers/main.yml b/ansible/roles/ceilometer/handlers/main.yml index 598d89f7d7..767468e703 100644 --- a/ansible/roles/ceilometer/handlers/main.yml +++ b/ansible/roles/ceilometer/handlers/main.yml @@ -16,7 +16,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -43,7 +43,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -69,7 +69,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml index 23154cc6ba..767cb6b255 100644 --- a/ansible/roles/ceilometer/tasks/config.yml +++ b/ansible/roles/ceilometer/tasks/config.yml @@ -171,7 +171,7 @@ volumes: "{{ item.value.volumes }}" register: check_ceilometer_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ ceilometer_services }}" diff --git a/ansible/roles/ceilometer/tasks/main.yml b/ansible/roles/ceilometer/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/ceilometer/tasks/main.yml +++ b/ansible/roles/ceilometer/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ceph/tasks/main.yml b/ansible/roles/ceph/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/ceph/tasks/main.yml +++ b/ansible/roles/ceph/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/chrony/handlers/main.yml b/ansible/roles/chrony/handlers/main.yml index 7c0b4c8371..c9add556f6 100644 --- a/ansible/roles/chrony/handlers/main.yml +++ b/ansible/roles/chrony/handlers/main.yml @@ -11,6 +11,6 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool diff --git a/ansible/roles/chrony/tasks/config.yml b/ansible/roles/chrony/tasks/config.yml index e19a55cf89..2dcb1e05bb 100644 --- a/ansible/roles/chrony/tasks/config.yml +++ b/ansible/roles/chrony/tasks/config.yml @@ -43,7 +43,7 @@ privileged: "{{ item.value.privileged }}" volumes: "{{ item.value.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ chrony_services }}" diff --git a/ansible/roles/chrony/tasks/main.yml b/ansible/roles/chrony/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/chrony/tasks/main.yml +++ b/ansible/roles/chrony/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/cinder/handlers/main.yml b/ansible/roles/cinder/handlers/main.yml index 0eccd28e2d..516d6ea9fb 100644 --- a/ansible/roles/cinder/handlers/main.yml +++ b/ansible/roles/cinder/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -38,7 +38,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -63,7 +63,7 @@ ipc_mode: "{{ service.ipc_mode | default('') }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -87,7 +87,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes | reject('equalto', '') | list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml index c09debe58d..f7b99bd64e 100644 --- a/ansible/roles/cinder/tasks/config.yml +++ b/ansible/roles/cinder/tasks/config.yml @@ -130,7 +130,7 @@ ipc_mode: "{{ item.value.ipc_mode | default('') }}" register: check_cinder_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ cinder_services }}" diff --git a/ansible/roles/cinder/tasks/main.yml b/ansible/roles/cinder/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/cinder/tasks/main.yml +++ b/ansible/roles/cinder/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/cloudkitty/handlers/main.yml b/ansible/roles/cloudkitty/handlers/main.yml index 158e60c6b5..56df7e205e 100644 --- a/ansible/roles/cloudkitty/handlers/main.yml +++ b/ansible/roles/cloudkitty/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -38,7 +38,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/cloudkitty/tasks/config.yml b/ansible/roles/cloudkitty/tasks/config.yml index 20504639bd..9be09d8940 100644 --- a/ansible/roles/cloudkitty/tasks/config.yml +++ b/ansible/roles/cloudkitty/tasks/config.yml @@ -106,7 +106,7 @@ volumes: "{{ item.value.volumes }}" register: check_cloudkitty_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ cloudkitty_services }}" diff --git a/ansible/roles/cloudkitty/tasks/main.yml b/ansible/roles/cloudkitty/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/cloudkitty/tasks/main.yml +++ b/ansible/roles/cloudkitty/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/collectd/handlers/main.yml b/ansible/roles/collectd/handlers/main.yml index 52d0d5851e..a7b92560d2 100644 --- a/ansible/roles/collectd/handlers/main.yml +++ b/ansible/roles/collectd/handlers/main.yml @@ -13,7 +13,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/collectd/tasks/config.yml b/ansible/roles/collectd/tasks/config.yml index f3432177cd..cda35fa903 100644 --- a/ansible/roles/collectd/tasks/config.yml +++ b/ansible/roles/collectd/tasks/config.yml @@ -69,7 +69,7 @@ volumes: "{{ item.value.volumes }}" register: check_collectd_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ collectd_services }}" diff --git a/ansible/roles/collectd/tasks/main.yml b/ansible/roles/collectd/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/collectd/tasks/main.yml +++ b/ansible/roles/collectd/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/common/handlers/main.yml b/ansible/roles/common/handlers/main.yml index f1c155d886..5e9e31f824 100644 --- a/ansible/roles/common/handlers/main.yml +++ b/ansible/roles/common/handlers/main.yml @@ -13,7 +13,7 @@ volumes: "{{ service.volumes }}" environment: "{{ service.environment }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - config_json.changed | bool or fluentd_input.changed | bool @@ -40,7 +40,7 @@ volumes: "{{ service.volumes }}" environment: "{{ service.environment }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - config_json.changed | bool or kolla_toolbox_container.changed | bool @@ -65,7 +65,7 @@ volumes: "{{ service.volumes }}" environment: "{{ service.environment }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - config_json.changed | bool or cron_confs.changed | bool diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 63d52beee2..c11328639a 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -256,7 +256,7 @@ environment: "{{ item.value.environment }}" register: check_common_containers when: - - action != "config" + - kolla_action != "config" - item.value.enabled | bool with_dict: "{{ common_services }}" notify: diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index c65c9e8588..0b4b423c16 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,5 +1,5 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" tags: common when: not common_run diff --git a/ansible/roles/congress/handlers/main.yml b/ansible/roles/congress/handlers/main.yml index c6f386f7b3..c6362984ca 100644 --- a/ansible/roles/congress/handlers/main.yml +++ b/ansible/roles/congress/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -60,7 +60,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/congress/tasks/config.yml b/ansible/roles/congress/tasks/config.yml index 5b490f19b9..a89c6b26ee 100644 --- a/ansible/roles/congress/tasks/config.yml +++ b/ansible/roles/congress/tasks/config.yml @@ -86,7 +86,7 @@ volumes: "{{ item.value.volumes }}" register: check_congress_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ congress_services }}" diff --git a/ansible/roles/congress/tasks/main.yml b/ansible/roles/congress/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/congress/tasks/main.yml +++ b/ansible/roles/congress/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/designate/handlers/main.yml b/ansible/roles/designate/handlers/main.yml index 8da26c2ffa..cd31d25df1 100644 --- a/ansible/roles/designate/handlers/main.yml +++ b/ansible/roles/designate/handlers/main.yml @@ -12,7 +12,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -36,7 +36,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -59,7 +59,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -82,7 +82,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -105,7 +105,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -128,7 +128,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -153,7 +153,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/designate/tasks/config.yml b/ansible/roles/designate/tasks/config.yml index d1c3bebd91..38d5cb273a 100644 --- a/ansible/roles/designate/tasks/config.yml +++ b/ansible/roles/designate/tasks/config.yml @@ -185,7 +185,7 @@ volumes: "{{ item.value.volumes }}" register: check_designate_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ designate_services }}" diff --git a/ansible/roles/designate/tasks/main.yml b/ansible/roles/designate/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/designate/tasks/main.yml +++ b/ansible/roles/designate/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/elasticsearch/handlers/main.yml b/ansible/roles/elasticsearch/handlers/main.yml index a1a14ee082..de8d04c2c3 100644 --- a/ansible/roles/elasticsearch/handlers/main.yml +++ b/ansible/roles/elasticsearch/handlers/main.yml @@ -14,7 +14,7 @@ environment: "{{ service.environment }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/elasticsearch/tasks/config.yml b/ansible/roles/elasticsearch/tasks/config.yml index ade859543c..f81efc53c4 100644 --- a/ansible/roles/elasticsearch/tasks/config.yml +++ b/ansible/roles/elasticsearch/tasks/config.yml @@ -59,7 +59,7 @@ environment: "{{ item.value.environment }}" register: check_elasticsearch_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ elasticsearch_services }}" diff --git a/ansible/roles/elasticsearch/tasks/main.yml b/ansible/roles/elasticsearch/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/elasticsearch/tasks/main.yml +++ b/ansible/roles/elasticsearch/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/etcd/handlers/main.yml b/ansible/roles/etcd/handlers/main.yml index 1410478c87..d469f4fcce 100644 --- a/ansible/roles/etcd/handlers/main.yml +++ b/ansible/roles/etcd/handlers/main.yml @@ -13,7 +13,7 @@ environment: "{{ service.environment }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json.changed | bool diff --git a/ansible/roles/etcd/tasks/config.yml b/ansible/roles/etcd/tasks/config.yml index 7c8725e94f..764108b2f3 100644 --- a/ansible/roles/etcd/tasks/config.yml +++ b/ansible/roles/etcd/tasks/config.yml @@ -36,7 +36,7 @@ environment: "{{ item.value.environment }}" register: check_etcd_containers when: - - action != "config" + - kolla_action != "config" - item.value.enabled | bool - item.value.host_in_groups | bool with_dict: "{{ etcd_services }}" diff --git a/ansible/roles/etcd/tasks/main.yml b/ansible/roles/etcd/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/etcd/tasks/main.yml +++ b/ansible/roles/etcd/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/freezer/handlers/main.yml b/ansible/roles/freezer/handlers/main.yml index 283bd47a04..56a67c70d8 100644 --- a/ansible/roles/freezer/handlers/main.yml +++ b/ansible/roles/freezer/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/freezer/tasks/config.yml b/ansible/roles/freezer/tasks/config.yml index 4d191a829d..758b2ca5d7 100644 --- a/ansible/roles/freezer/tasks/config.yml +++ b/ansible/roles/freezer/tasks/config.yml @@ -103,7 +103,7 @@ volumes: "{{ item.value.volumes }}" register: check_freezer_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ freezer_services }}" diff --git a/ansible/roles/freezer/tasks/main.yml b/ansible/roles/freezer/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/freezer/tasks/main.yml +++ b/ansible/roles/freezer/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/glance/handlers/main.yml b/ansible/roles/glance/handlers/main.yml index 851af6c7e3..112b5c75f9 100644 --- a/ansible/roles/glance/handlers/main.yml +++ b/ansible/roles/glance/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in glance_api_hosts - service.enabled | bool - config_json.changed | bool @@ -38,7 +38,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index 724d2001c4..adb26553eb 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -120,7 +120,7 @@ volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" register: check_glance_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ glance_services }}" diff --git a/ansible/roles/glance/tasks/main.yml b/ansible/roles/glance/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/glance/tasks/main.yml +++ b/ansible/roles/glance/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/gnocchi/handlers/main.yml b/ansible/roles/gnocchi/handlers/main.yml index e6fca5eee2..76d192bf38 100644 --- a/ansible/roles/gnocchi/handlers/main.yml +++ b/ansible/roles/gnocchi/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -38,7 +38,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -61,7 +61,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index 394b263b08..ad3284eda5 100644 --- a/ansible/roles/gnocchi/tasks/config.yml +++ b/ansible/roles/gnocchi/tasks/config.yml @@ -109,7 +109,7 @@ volumes: "{{ item.value.volumes }}" register: check_gnocchi_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ gnocchi_services }}" diff --git a/ansible/roles/gnocchi/tasks/main.yml b/ansible/roles/gnocchi/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/gnocchi/tasks/main.yml +++ b/ansible/roles/gnocchi/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/grafana/handlers/main.yml b/ansible/roles/grafana/handlers/main.yml index 170e86b701..ce4cfd67c4 100644 --- a/ansible/roles/grafana/handlers/main.yml +++ b/ansible/roles/grafana/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/grafana/tasks/config.yml b/ansible/roles/grafana/tasks/config.yml index 1c69d94b7f..4042721e6a 100644 --- a/ansible/roles/grafana/tasks/config.yml +++ b/ansible/roles/grafana/tasks/config.yml @@ -109,7 +109,7 @@ volumes: "{{ item.value.volumes }}" register: check_grafana_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ grafana_services }}" diff --git a/ansible/roles/grafana/tasks/main.yml b/ansible/roles/grafana/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/grafana/tasks/main.yml +++ b/ansible/roles/grafana/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/haproxy/handlers/main.yml b/ansible/roles/haproxy/handlers/main.yml index d81ab5d315..b9fe18928c 100644 --- a/ansible/roles/haproxy/handlers/main.yml +++ b/ansible/roles/haproxy/handlers/main.yml @@ -13,7 +13,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -51,7 +51,7 @@ register: status changed_when: status.stdout.find('changed') != -1 when: - - action != "config" + - kolla_action != "config" - haproxy_config_jsons.changed | bool or haproxy_cfg.changed | bool or haproxy_pem.changed | bool diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml index 04c43bce89..9a1193a3c5 100644 --- a/ansible/roles/haproxy/tasks/config.yml +++ b/ansible/roles/haproxy/tasks/config.yml @@ -103,7 +103,7 @@ privileged: "{{ item.value.privileged | default(False) }}" register: check_haproxy_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ haproxy_services }}" diff --git a/ansible/roles/haproxy/tasks/main.yml b/ansible/roles/haproxy/tasks/main.yml index 0e3f30f464..91a951d595 100644 --- a/ansible/roles/haproxy/tasks/main.yml +++ b/ansible/roles/haproxy/tasks/main.yml @@ -1,3 +1,3 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" when: inventory_hostname in groups['haproxy'] diff --git a/ansible/roles/heat/handlers/main.yml b/ansible/roles/heat/handlers/main.yml index aea3a22d2e..c07597588f 100644 --- a/ansible/roles/heat/handlers/main.yml +++ b/ansible/roles/heat/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -60,7 +60,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml index 5a49edf9d8..13cddf87ae 100644 --- a/ansible/roles/heat/tasks/config.yml +++ b/ansible/roles/heat/tasks/config.yml @@ -103,7 +103,7 @@ volumes: "{{ item.value.volumes }}" register: check_heat_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ heat_services }}" diff --git a/ansible/roles/heat/tasks/main.yml b/ansible/roles/heat/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/heat/tasks/main.yml +++ b/ansible/roles/heat/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/horizon/handlers/main.yml b/ansible/roles/horizon/handlers/main.yml index f02501cd50..852e777b85 100644 --- a/ansible/roles/horizon/handlers/main.yml +++ b/ansible/roles/horizon/handlers/main.yml @@ -11,7 +11,7 @@ environment: "{{ service.environment }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - horizon_config_json | changed diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml index b78b327269..d52761aada 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -126,7 +126,7 @@ volumes: "{{ horizon.volumes }}" register: check_horizon_container when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[horizon.group] - horizon.enabled | bool notify: diff --git a/ansible/roles/horizon/tasks/main.yml b/ansible/roles/horizon/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/horizon/tasks/main.yml +++ b/ansible/roles/horizon/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/influxdb/handlers/main.yml b/ansible/roles/influxdb/handlers/main.yml index 2e52dc9636..8750d93537 100644 --- a/ansible/roles/influxdb/handlers/main.yml +++ b/ansible/roles/influxdb/handlers/main.yml @@ -12,7 +12,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/influxdb/tasks/config.yml b/ansible/roles/influxdb/tasks/config.yml index 111954bd3b..ba56761db6 100644 --- a/ansible/roles/influxdb/tasks/config.yml +++ b/ansible/roles/influxdb/tasks/config.yml @@ -54,7 +54,7 @@ volumes: "{{ item.value.volumes }}" register: check_influxdb_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ influxdb_services }}" diff --git a/ansible/roles/influxdb/tasks/main.yml b/ansible/roles/influxdb/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/influxdb/tasks/main.yml +++ b/ansible/roles/influxdb/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ironic/tasks/main.yml b/ansible/roles/ironic/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/ironic/tasks/main.yml +++ b/ansible/roles/ironic/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/iscsi/tasks/main.yml b/ansible/roles/iscsi/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/iscsi/tasks/main.yml +++ b/ansible/roles/iscsi/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/karbor/handlers/main.yml b/ansible/roles/karbor/handlers/main.yml index 32dbcee361..3ebfb9e5b9 100644 --- a/ansible/roles/karbor/handlers/main.yml +++ b/ansible/roles/karbor/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -34,7 +34,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -56,7 +56,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/karbor/tasks/config.yml b/ansible/roles/karbor/tasks/config.yml index 80e06f82e4..3e837c91c1 100644 --- a/ansible/roles/karbor/tasks/config.yml +++ b/ansible/roles/karbor/tasks/config.yml @@ -78,7 +78,7 @@ become: true register: check_karbor_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ karbor_services }}" diff --git a/ansible/roles/karbor/tasks/main.yml b/ansible/roles/karbor/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/karbor/tasks/main.yml +++ b/ansible/roles/karbor/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/keystone/handlers/main.yml b/ansible/roles/keystone/handlers/main.yml index 26bec8da41..f5ab008c50 100644 --- a/ansible/roles/keystone/handlers/main.yml +++ b/ansible/roles/keystone/handlers/main.yml @@ -21,7 +21,7 @@ volumes: "{{ service.volumes|reject('equalto', '')|list }}" run_once: True when: - - action == "upgrade" + - kolla_action == "upgrade" - service.enabled | bool - inventory_hostname == groups[service.group][0] @@ -40,7 +40,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -64,7 +64,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -86,7 +86,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -114,6 +114,6 @@ volumes: "{{ service.volumes|reject('equalto', '')|list }}" run_once: True when: - - action == "upgrade" + - kolla_action == "upgrade" - service.enabled | bool - inventory_hostname == groups[service.group][-1] diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml index df07c35c86..b6988f959b 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -237,7 +237,7 @@ image: "{{ item.value.image }}" volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool register: check_keystone_containers diff --git a/ansible/roles/keystone/tasks/main.yml b/ansible/roles/keystone/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/keystone/tasks/main.yml +++ b/ansible/roles/keystone/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/kibana/handlers/main.yml b/ansible/roles/kibana/handlers/main.yml index 3cf27af666..82df9a7362 100644 --- a/ansible/roles/kibana/handlers/main.yml +++ b/ansible/roles/kibana/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/kibana/tasks/config.yml b/ansible/roles/kibana/tasks/config.yml index 2306b4a617..91eb214240 100644 --- a/ansible/roles/kibana/tasks/config.yml +++ b/ansible/roles/kibana/tasks/config.yml @@ -49,7 +49,7 @@ volumes: "{{ item.value.volumes }}" register: check_kibana_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ kibana_services }}" diff --git a/ansible/roles/kibana/tasks/main.yml b/ansible/roles/kibana/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/kibana/tasks/main.yml +++ b/ansible/roles/kibana/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/kuryr/handlers/main.yml b/ansible/roles/kuryr/handlers/main.yml index b7710994dc..74a8c98eb1 100644 --- a/ansible/roles/kuryr/handlers/main.yml +++ b/ansible/roles/kuryr/handlers/main.yml @@ -16,7 +16,7 @@ cap_add: "{{ service.cap_add }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/kuryr/tasks/config.yml b/ansible/roles/kuryr/tasks/config.yml index f4c0fddc60..d67ce3325d 100644 --- a/ansible/roles/kuryr/tasks/config.yml +++ b/ansible/roles/kuryr/tasks/config.yml @@ -107,7 +107,7 @@ volumes: "{{ item.value.volumes }}" register: check_kuryr_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ kuryr_services }}" diff --git a/ansible/roles/kuryr/tasks/main.yml b/ansible/roles/kuryr/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/kuryr/tasks/main.yml +++ b/ansible/roles/kuryr/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/magnum/handlers/main.yml b/ansible/roles/magnum/handlers/main.yml index bc6ab30474..6827997cee 100644 --- a/ansible/roles/magnum/handlers/main.yml +++ b/ansible/roles/magnum/handlers/main.yml @@ -15,7 +15,7 @@ volumes: "{{ service.volumes|reject('equalto', '')|list }}" environment: "{{ service.environment }}" 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|reject('equalto', '')|list }}" environment: "{{ service.environment }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml index ba18435738..518f5dc0f5 100644 --- a/ansible/roles/magnum/tasks/config.yml +++ b/ansible/roles/magnum/tasks/config.yml @@ -92,7 +92,7 @@ environment: "{{ item.value.environment }}" register: check_magnum_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ magnum_services }}" diff --git a/ansible/roles/magnum/tasks/main.yml b/ansible/roles/magnum/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/magnum/tasks/main.yml +++ b/ansible/roles/magnum/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/manila/handlers/main.yml b/ansible/roles/manila/handlers/main.yml index a1638eab87..6cf6cb1365 100644 --- a/ansible/roles/manila/handlers/main.yml +++ b/ansible/roles/manila/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -38,7 +38,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -61,7 +61,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -84,7 +84,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml index cf0ef2b70c..87188cedd4 100644 --- a/ansible/roles/manila/tasks/config.yml +++ b/ansible/roles/manila/tasks/config.yml @@ -115,7 +115,7 @@ volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" register: check_manila_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ manila_services }}" diff --git a/ansible/roles/manila/tasks/main.yml b/ansible/roles/manila/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/manila/tasks/main.yml +++ b/ansible/roles/manila/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/mariadb/handlers/main.yml b/ansible/roles/mariadb/handlers/main.yml index fcc04f767b..5e03334acc 100644 --- a/ansible/roles/mariadb/handlers/main.yml +++ b/ansible/roles/mariadb/handlers/main.yml @@ -53,7 +53,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname != master_host - inventory_hostname in groups[service.group] - service.enabled | bool @@ -79,7 +79,7 @@ retries: 10 delay: 6 when: - - action != "config" + - kolla_action != "config" - inventory_hostname != master_host - name: restart master mariadb @@ -94,7 +94,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname == master_host - inventory_hostname in groups[service.group] - service.enabled | bool @@ -120,5 +120,5 @@ retries: 10 delay: 6 when: - - action != "config" + - kolla_action != "config" - inventory_hostname == master_host diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml index abb0745986..3953d810af 100644 --- a/ansible/roles/mariadb/tasks/config.yml +++ b/ansible/roles/mariadb/tasks/config.yml @@ -74,7 +74,7 @@ become: true register: check_mariadb_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ mariadb_services }}" diff --git a/ansible/roles/mariadb/tasks/main.yml b/ansible/roles/mariadb/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/mariadb/tasks/main.yml +++ b/ansible/roles/mariadb/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/memcached/handlers/main.yml b/ansible/roles/memcached/handlers/main.yml index 537132b9d6..e3eb27dba0 100644 --- a/ansible/roles/memcached/handlers/main.yml +++ b/ansible/roles/memcached/handlers/main.yml @@ -9,7 +9,7 @@ name: "{{ service.container_name }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - memcached_config_json.changed | bool diff --git a/ansible/roles/memcached/tasks/config.yml b/ansible/roles/memcached/tasks/config.yml index 2b6409d3a9..f8df92707b 100644 --- a/ansible/roles/memcached/tasks/config.yml +++ b/ansible/roles/memcached/tasks/config.yml @@ -35,5 +35,5 @@ when: - inventory_hostname in groups[service.group] - service.enabled | bool - - action != "config" + - kolla_action != "config" notify: Restart memcached container diff --git a/ansible/roles/memcached/tasks/main.yml b/ansible/roles/memcached/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/memcached/tasks/main.yml +++ b/ansible/roles/memcached/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/mistral/handlers/main.yml b/ansible/roles/mistral/handlers/main.yml index dfbbd05734..5cf73cf0f2 100644 --- a/ansible/roles/mistral/handlers/main.yml +++ b/ansible/roles/mistral/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -60,7 +60,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml index 01b3dd415e..07ac83e86b 100644 --- a/ansible/roles/mistral/tasks/config.yml +++ b/ansible/roles/mistral/tasks/config.yml @@ -86,7 +86,7 @@ volumes: "{{ item.value.volumes }}" register: check_mistral_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ mistral_services }}" diff --git a/ansible/roles/mistral/tasks/main.yml b/ansible/roles/mistral/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/mistral/tasks/main.yml +++ b/ansible/roles/mistral/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/mongodb/tasks/main.yml b/ansible/roles/mongodb/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/mongodb/tasks/main.yml +++ b/ansible/roles/mongodb/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/multipathd/tasks/main.yml b/ansible/roles/multipathd/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/multipathd/tasks/main.yml +++ b/ansible/roles/multipathd/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/murano/tasks/main.yml b/ansible/roles/murano/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/murano/tasks/main.yml +++ b/ansible/roles/murano/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/murano/tasks/start.yml b/ansible/roles/murano/tasks/start.yml index c3b70ab029..c731b8c6bf 100644 --- a/ansible/roles/murano/tasks/start.yml +++ b/ansible/roles/murano/tasks/start.yml @@ -64,7 +64,7 @@ run_once: True delegate_to: "{{ groups['murano-api'][0] }}" when: - - status.stdout.find("io.murano") == -1 or action == "upgrade" + - status.stdout.find("io.murano") == -1 or kolla_action == "upgrade" - name: Importing Murano applications library package command: > @@ -78,4 +78,4 @@ run_once: True delegate_to: "{{ groups['murano-api'][0] }}" when: - - status.stdout.find("io.murano.applications") == -1 or action == "upgrade" + - status.stdout.find("io.murano.applications") == -1 or kolla_action == "upgrade" diff --git a/ansible/roles/neutron/handlers/main.yml b/ansible/roles/neutron/handlers/main.yml index 3e11d548a9..fe18ad8d41 100644 --- a/ansible/roles/neutron/handlers/main.yml +++ b/ansible/roles/neutron/handlers/main.yml @@ -18,7 +18,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -47,7 +47,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -73,7 +73,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -100,7 +100,7 @@ privileged: "{{ service.privileged | default(False) }}" with_sequence: "start=1 end={{ num_nova_fake_per_node }}" when: - - action != "config" + - kolla_action != "config" - enable_nova_fake | bool - neutron_plugin_agent == "openvswitch" - inventory_hostname in groups["compute"] @@ -127,7 +127,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -152,7 +152,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -182,7 +182,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -211,7 +211,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -237,7 +237,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -262,7 +262,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -287,7 +287,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml index c1cc895b9d..5beef5de65 100644 --- a/ansible/roles/neutron/tasks/config-neutron-fake.yml +++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml @@ -69,7 +69,7 @@ volumes: "{{ neutron_openvswitch_agent.volumes }}" register: check_fake_neutron_openvswitch_agent when: - - action != "config" + - kolla_action != "config" - enable_nova_fake | bool - neutron_plugin_agent == "openvswitch" - inventory_hostname in groups["compute"] diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index 6b2ed8afde..bd1e9d3614 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -423,7 +423,7 @@ volumes: "{{ item.value.volumes }}" register: check_neutron_containers when: - - action != "config" + - kolla_action != "config" - item.value.enabled | bool - item.value.host_in_groups | bool with_dict: "{{ neutron_services }}" diff --git a/ansible/roles/neutron/tasks/main.yml b/ansible/roles/neutron/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/neutron/tasks/main.yml +++ b/ansible/roles/neutron/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/nova-hyperv/tasks/main.yml b/ansible/roles/nova-hyperv/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/nova-hyperv/tasks/main.yml +++ b/ansible/roles/nova-hyperv/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/nova/handlers/main.yml b/ansible/roles/nova/handlers/main.yml index 777659d5dc..4495c35bdd 100644 --- a/ansible/roles/nova/handlers/main.yml +++ b/ansible/roles/nova/handlers/main.yml @@ -14,7 +14,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -41,7 +41,7 @@ retries: 5 until: restart_nova_libvirt | success when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -63,7 +63,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -88,7 +88,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -112,7 +112,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -136,7 +136,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -161,7 +161,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -185,7 +185,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -209,7 +209,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -233,7 +233,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -259,7 +259,7 @@ ipc_mode: "{{ service.ipc_mode | default(omit) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -284,7 +284,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -309,6 +309,6 @@ - "kolla_logs:/var/log/kolla/" with_sequence: start=1 end={{ num_nova_fake_per_node }} when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups['compute'] - enable_nova_fake | bool diff --git a/ansible/roles/nova/tasks/config-nova-fake.yml b/ansible/roles/nova/tasks/config-nova-fake.yml index e807134d9e..c9dc9ca080 100644 --- a/ansible/roles/nova/tasks/config-nova-fake.yml +++ b/ansible/roles/nova/tasks/config-nova-fake.yml @@ -61,7 +61,7 @@ become: true with_sequence: start=1 end={{ num_nova_fake_per_node }} when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups['compute'] - enable_nova_fake | bool notify: diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index f2ccae1054..d3199e7f7c 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -204,7 +204,7 @@ volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" register: check_nova_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ nova_services }}" diff --git a/ansible/roles/nova/tasks/main.yml b/ansible/roles/nova/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/nova/tasks/main.yml +++ b/ansible/roles/nova/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/octavia/handlers/main.yml b/ansible/roles/octavia/handlers/main.yml index 0192932c73..3e19467b8c 100644 --- a/ansible/roles/octavia/handlers/main.yml +++ b/ansible/roles/octavia/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -34,7 +34,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -56,7 +56,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -78,7 +78,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/octavia/tasks/config.yml b/ansible/roles/octavia/tasks/config.yml index 91745ac559..07bb5187be 100644 --- a/ansible/roles/octavia/tasks/config.yml +++ b/ansible/roles/octavia/tasks/config.yml @@ -109,7 +109,7 @@ volumes: "{{ item.value.volumes }}" register: check_octavia_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ octavia_services }}" diff --git a/ansible/roles/octavia/tasks/main.yml b/ansible/roles/octavia/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/octavia/tasks/main.yml +++ b/ansible/roles/octavia/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/opendaylight/handlers/main.yml b/ansible/roles/opendaylight/handlers/main.yml index 683ade5631..5c9f780300 100644 --- a/ansible/roles/opendaylight/handlers/main.yml +++ b/ansible/roles/opendaylight/handlers/main.yml @@ -11,7 +11,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - opendaylight_config_json | changed diff --git a/ansible/roles/opendaylight/tasks/config.yml b/ansible/roles/opendaylight/tasks/config.yml index 69031d2606..ff4b0c8d8e 100644 --- a/ansible/roles/opendaylight/tasks/config.yml +++ b/ansible/roles/opendaylight/tasks/config.yml @@ -214,7 +214,7 @@ volumes: "{{ item.value.volumes }}" register: check_opendaylight_containers when: - - action != "config" + - kolla_action != "config" - item.value.enabled | bool - item.value.host_in_groups | bool with_dict: "{{ opendaylight_services }}" diff --git a/ansible/roles/opendaylight/tasks/main.yml b/ansible/roles/opendaylight/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/opendaylight/tasks/main.yml +++ b/ansible/roles/opendaylight/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/openvswitch/handlers/main.yml b/ansible/roles/openvswitch/handlers/main.yml index 0654ecd0d3..f0c877c86d 100644 --- a/ansible/roles/openvswitch/handlers/main.yml +++ b/ansible/roles/openvswitch/handlers/main.yml @@ -12,7 +12,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -57,7 +57,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed diff --git a/ansible/roles/openvswitch/tasks/config.yml b/ansible/roles/openvswitch/tasks/config.yml index 551f3fac46..8781d7ed5d 100644 --- a/ansible/roles/openvswitch/tasks/config.yml +++ b/ansible/roles/openvswitch/tasks/config.yml @@ -64,7 +64,7 @@ volumes: "{{ item.value.volumes }}" register: check_openvswitch_containers when: - - action != "config" + - kolla_action != "config" - item.value.enabled | bool - item.value.host_in_groups | bool with_dict: "{{ openvswitch_services }}" diff --git a/ansible/roles/openvswitch/tasks/main.yml b/ansible/roles/openvswitch/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/openvswitch/tasks/main.yml +++ b/ansible/roles/openvswitch/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ovs-dpdk/handlers/main.yml b/ansible/roles/ovs-dpdk/handlers/main.yml index d18e405063..6e61eb6e17 100644 --- a/ansible/roles/ovs-dpdk/handlers/main.yml +++ b/ansible/roles/ovs-dpdk/handlers/main.yml @@ -12,7 +12,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed @@ -65,7 +65,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(True) }}" when: - - action != "config" + - kolla_action != "config" - service.enabled | bool - service.host_in_groups | bool - config_json | changed diff --git a/ansible/roles/ovs-dpdk/tasks/config.yml b/ansible/roles/ovs-dpdk/tasks/config.yml index 9701a89b9d..a5134b8d99 100644 --- a/ansible/roles/ovs-dpdk/tasks/config.yml +++ b/ansible/roles/ovs-dpdk/tasks/config.yml @@ -54,7 +54,7 @@ volumes: "{{ item.value.volumes }}" register: check_ovsdpdk_containers when: - - action != "config" + - kolla_action != "config" - item.value.enabled | bool - item.value.host_in_groups | bool with_dict: "{{ ovsdpdk_services }}" diff --git a/ansible/roles/ovs-dpdk/tasks/main.yml b/ansible/roles/ovs-dpdk/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/ovs-dpdk/tasks/main.yml +++ b/ansible/roles/ovs-dpdk/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/panko/handlers/main.yml b/ansible/roles/panko/handlers/main.yml index 2a19666ec8..36db6b0fc4 100644 --- a/ansible/roles/panko/handlers/main.yml +++ b/ansible/roles/panko/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/panko/tasks/config.yml b/ansible/roles/panko/tasks/config.yml index 5d461362bd..00e42bc3d4 100644 --- a/ansible/roles/panko/tasks/config.yml +++ b/ansible/roles/panko/tasks/config.yml @@ -103,7 +103,7 @@ volumes: "{{ item.value.volumes }}" register: check_panko_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ panko_services }}" diff --git a/ansible/roles/panko/tasks/main.yml b/ansible/roles/panko/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/panko/tasks/main.yml +++ b/ansible/roles/panko/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/prechecks/tasks/user_checks.yml b/ansible/roles/prechecks/tasks/user_checks.yml index fe8d4afff0..df03fc8284 100644 --- a/ansible/roles/prechecks/tasks/user_checks.yml +++ b/ansible/roles/prechecks/tasks/user_checks.yml @@ -12,6 +12,7 @@ # NOTE(duonghq): it's only a basic check, should be refined later - name: Check if ansible user can do passwordless sudo - shell: sudo -n true + shell: "true" + become: yes register: result failed_when: result | failed diff --git a/ansible/roles/qdrouterd/handlers/main.yml b/ansible/roles/qdrouterd/handlers/main.yml index 807a181a20..3cf7a02cd1 100644 --- a/ansible/roles/qdrouterd/handlers/main.yml +++ b/ansible/roles/qdrouterd/handlers/main.yml @@ -12,7 +12,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/qdrouterd/tasks/add_sasl_user.yml b/ansible/roles/qdrouterd/tasks/add_sasl_user.yml index 78437ec907..7babd54594 100644 --- a/ansible/roles/qdrouterd/tasks/add_sasl_user.yml +++ b/ansible/roles/qdrouterd/tasks/add_sasl_user.yml @@ -6,11 +6,11 @@ connect_timeout: 1 state: started when: - - action != "config" + - kolla_action != "config" - name: Create qdrouterd sasl user shell: echo {{ qdrouterd_password }} | docker exec -u root -i qdrouterd saslpasswd2 -c -p -f /var/lib/qdrouterd/qdrouterd.sasldb -u AMQP {{ qdrouterd_user }} run_once: true changed_when: true when: - - action != "config" + - kolla_action != "config" diff --git a/ansible/roles/qdrouterd/tasks/config.yml b/ansible/roles/qdrouterd/tasks/config.yml index bf898184af..6d93b0bd9e 100644 --- a/ansible/roles/qdrouterd/tasks/config.yml +++ b/ansible/roles/qdrouterd/tasks/config.yml @@ -73,7 +73,7 @@ volumes: "{{ item.value.volumes }}" register: check_qdrouterd_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ qdrouterd_services }}" diff --git a/ansible/roles/qdrouterd/tasks/main.yml b/ansible/roles/qdrouterd/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/qdrouterd/tasks/main.yml +++ b/ansible/roles/qdrouterd/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/rabbitmq/handlers/main.yml b/ansible/roles/rabbitmq/handlers/main.yml index e219d13087..932253915f 100644 --- a/ansible/roles/rabbitmq/handlers/main.yml +++ b/ansible/roles/rabbitmq/handlers/main.yml @@ -13,7 +13,7 @@ volumes: "{{ service.volumes }}" environment: "{{ service.environment }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/rabbitmq/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml index faa511536d..198549ecfe 100644 --- a/ansible/roles/rabbitmq/tasks/config.yml +++ b/ansible/roles/rabbitmq/tasks/config.yml @@ -56,7 +56,7 @@ environment: "{{ item.value.environment }}" register: check_rabbitmq_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ rabbitmq_services }}" diff --git a/ansible/roles/rabbitmq/tasks/main.yml b/ansible/roles/rabbitmq/tasks/main.yml index 9a089f446a..58231209f8 100644 --- a/ansible/roles/rabbitmq/tasks/main.yml +++ b/ansible/roles/rabbitmq/tasks/main.yml @@ -1,3 +1,3 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" when: inventory_hostname in groups[role_rabbitmq_groups] diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml index f0cd9902d2..c27a71b50f 100644 --- a/ansible/roles/rabbitmq/tasks/upgrade.yml +++ b/ansible/roles/rabbitmq/tasks/upgrade.yml @@ -16,8 +16,8 @@ - name: Find gospel node command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node - changed_when: "{{ (gospel_node.stdout | from_json).changed }}" - failed_when: "{{ (gospel_node.stdout | from_json).failed }}" + changed_when: gospel_node.stdout | from_json | changed + failed_when: gospel_node.stdout | from_json | failed register: gospel_node run_once: True diff --git a/ansible/roles/rally/handlers/main.yml b/ansible/roles/rally/handlers/main.yml index dfb5ab5072..de9f02214b 100644 --- a/ansible/roles/rally/handlers/main.yml +++ b/ansible/roles/rally/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/rally/tasks/config.yml b/ansible/roles/rally/tasks/config.yml index a3d2b595ab..7e2b07ad08 100644 --- a/ansible/roles/rally/tasks/config.yml +++ b/ansible/roles/rally/tasks/config.yml @@ -85,7 +85,7 @@ volumes: "{{ item.value.volumes }}" register: check_rally_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ rally_services }}" diff --git a/ansible/roles/rally/tasks/main.yml b/ansible/roles/rally/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/rally/tasks/main.yml +++ b/ansible/roles/rally/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/redis/handlers/main.yml b/ansible/roles/redis/handlers/main.yml index a2dbf0a9c1..f0920265d2 100644 --- a/ansible/roles/redis/handlers/main.yml +++ b/ansible/roles/redis/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -34,7 +34,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/redis/tasks/config.yml b/ansible/roles/redis/tasks/config.yml index fbd55fbc74..1fc3836935 100644 --- a/ansible/roles/redis/tasks/config.yml +++ b/ansible/roles/redis/tasks/config.yml @@ -49,7 +49,7 @@ volumes: "{{ item.value.volumes }}" register: check_redis_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ redis_services }}" diff --git a/ansible/roles/redis/tasks/main.yml b/ansible/roles/redis/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/redis/tasks/main.yml +++ b/ansible/roles/redis/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/sahara/handlers/main.yml b/ansible/roles/sahara/handlers/main.yml index d45993426c..37a2f4a7a8 100644 --- a/ansible/roles/sahara/handlers/main.yml +++ b/ansible/roles/sahara/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -38,7 +38,7 @@ volumes: "{{ service.volumes }}" privileged: "{{ service.privileged | default(False) }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/sahara/tasks/config.yml b/ansible/roles/sahara/tasks/config.yml index c86d177fed..14753b2a91 100644 --- a/ansible/roles/sahara/tasks/config.yml +++ b/ansible/roles/sahara/tasks/config.yml @@ -92,7 +92,7 @@ volumes: "{{ item.value.volumes }}" register: check_sahara_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ sahara_services }}" diff --git a/ansible/roles/sahara/tasks/main.yml b/ansible/roles/sahara/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/sahara/tasks/main.yml +++ b/ansible/roles/sahara/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/searchlight/handlers/main.yml b/ansible/roles/searchlight/handlers/main.yml index 485a62bd90..8ec965d753 100644 --- a/ansible/roles/searchlight/handlers/main.yml +++ b/ansible/roles/searchlight/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/searchlight/tasks/config.yml b/ansible/roles/searchlight/tasks/config.yml index 5971d64595..375f80a081 100644 --- a/ansible/roles/searchlight/tasks/config.yml +++ b/ansible/roles/searchlight/tasks/config.yml @@ -87,7 +87,7 @@ volumes: "{{ item.value.volumes }}" register: check_searchlight_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ searchlight_services }}" diff --git a/ansible/roles/searchlight/tasks/main.yml b/ansible/roles/searchlight/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/searchlight/tasks/main.yml +++ b/ansible/roles/searchlight/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/senlin/handlers/main.yml b/ansible/roles/senlin/handlers/main.yml index efd10f592a..43c017da8e 100644 --- a/ansible/roles/senlin/handlers/main.yml +++ b/ansible/roles/senlin/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/senlin/tasks/config.yml b/ansible/roles/senlin/tasks/config.yml index 519244d7d5..a460b8382d 100644 --- a/ansible/roles/senlin/tasks/config.yml +++ b/ansible/roles/senlin/tasks/config.yml @@ -91,7 +91,7 @@ volumes: "{{ item.value.volumes }}" register: check_senlin_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ senlin_services }}" diff --git a/ansible/roles/senlin/tasks/main.yml b/ansible/roles/senlin/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/senlin/tasks/main.yml +++ b/ansible/roles/senlin/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/skydive/handlers/main.yml b/ansible/roles/skydive/handlers/main.yml index 01466e062d..02ebb45379 100644 --- a/ansible/roles/skydive/handlers/main.yml +++ b/ansible/roles/skydive/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -35,7 +35,7 @@ privileged: "{{ service.privileged }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/skydive/tasks/config.yml b/ansible/roles/skydive/tasks/config.yml index cb50ba599e..d269d4afed 100644 --- a/ansible/roles/skydive/tasks/config.yml +++ b/ansible/roles/skydive/tasks/config.yml @@ -52,7 +52,7 @@ volumes: "{{ item.value.volumes }}" register: check_skydive_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ skydive_services }}" diff --git a/ansible/roles/skydive/tasks/main.yml b/ansible/roles/skydive/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/skydive/tasks/main.yml +++ b/ansible/roles/skydive/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/solum/handlers/main.yml b/ansible/roles/solum/handlers/main.yml index d4aa7df321..29e2bf5700 100644 --- a/ansible/roles/solum/handlers/main.yml +++ b/ansible/roles/solum/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -34,7 +34,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -55,7 +55,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -76,7 +76,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/solum/tasks/config.yml b/ansible/roles/solum/tasks/config.yml index f724397f43..f8a98e37e3 100644 --- a/ansible/roles/solum/tasks/config.yml +++ b/ansible/roles/solum/tasks/config.yml @@ -62,7 +62,7 @@ volumes: "{{ item.value.volumes }}" register: check_solum_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ solum_services }}" diff --git a/ansible/roles/solum/tasks/main.yml b/ansible/roles/solum/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/solum/tasks/main.yml +++ b/ansible/roles/solum/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/swift/tasks/main.yml b/ansible/roles/swift/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/swift/tasks/main.yml +++ b/ansible/roles/swift/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/tacker/handlers/main.yml b/ansible/roles/tacker/handlers/main.yml index d670bbffb8..fb81cd60ae 100644 --- a/ansible/roles/tacker/handlers/main.yml +++ b/ansible/roles/tacker/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/tacker/tasks/config.yml b/ansible/roles/tacker/tasks/config.yml index a94dd3f9c8..7e9dae85c0 100644 --- a/ansible/roles/tacker/tasks/config.yml +++ b/ansible/roles/tacker/tasks/config.yml @@ -89,7 +89,7 @@ image: "{{ item.value.image }}" volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" when: - - action != 'config' + - kolla_action != 'config' - inventory_hostname in groups[item.value.group] - item.value.enabled | bool register: check_tacker_containers diff --git a/ansible/roles/tacker/tasks/main.yml b/ansible/roles/tacker/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/tacker/tasks/main.yml +++ b/ansible/roles/tacker/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/telegraf/handlers/main.yml b/ansible/roles/telegraf/handlers/main.yml index 175abafe25..106c4b5321 100644 --- a/ansible/roles/telegraf/handlers/main.yml +++ b/ansible/roles/telegraf/handlers/main.yml @@ -16,7 +16,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/telegraf/tasks/config.yml b/ansible/roles/telegraf/tasks/config.yml index 5be8c231f5..0cb8601141 100644 --- a/ansible/roles/telegraf/tasks/config.yml +++ b/ansible/roles/telegraf/tasks/config.yml @@ -72,7 +72,7 @@ pid_mode: "{{ item.value.pid_mode }}" register: check_telegraf_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ telegraf_services }}" diff --git a/ansible/roles/telegraf/tasks/main.yml b/ansible/roles/telegraf/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/telegraf/tasks/main.yml +++ b/ansible/roles/telegraf/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/tempest/handlers/main.yml b/ansible/roles/tempest/handlers/main.yml index f327ddd133..6ae4d7110b 100644 --- a/ansible/roles/tempest/handlers/main.yml +++ b/ansible/roles/tempest/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/tempest/tasks/config.yml b/ansible/roles/tempest/tasks/config.yml index c58367d792..a66808ca0a 100644 --- a/ansible/roles/tempest/tasks/config.yml +++ b/ansible/roles/tempest/tasks/config.yml @@ -53,7 +53,7 @@ volumes: "{{ item.value.volumes }}" register: check_tempest_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ tempest_services }}" diff --git a/ansible/roles/tempest/tasks/main.yml b/ansible/roles/tempest/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/tempest/tasks/main.yml +++ b/ansible/roles/tempest/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/trove/handlers/main.yml b/ansible/roles/trove/handlers/main.yml index 8c973ddba9..02770293ae 100644 --- a/ansible/roles/trove/handlers/main.yml +++ b/ansible/roles/trove/handlers/main.yml @@ -13,7 +13,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -34,7 +34,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -55,7 +55,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/trove/tasks/config.yml b/ansible/roles/trove/tasks/config.yml index 25ed565d5b..ff771ea14b 100644 --- a/ansible/roles/trove/tasks/config.yml +++ b/ansible/roles/trove/tasks/config.yml @@ -80,7 +80,7 @@ volumes: "{{ item.value.volumes }}" register: check_trove_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ trove_services }}" diff --git a/ansible/roles/trove/tasks/main.yml b/ansible/roles/trove/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/trove/tasks/main.yml +++ b/ansible/roles/trove/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/vitrage/handlers/main.yml b/ansible/roles/vitrage/handlers/main.yml index 9862584d69..c5d1393470 100644 --- a/ansible/roles/vitrage/handlers/main.yml +++ b/ansible/roles/vitrage/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -60,7 +60,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -83,7 +83,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -106,7 +106,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/vitrage/tasks/config.yml b/ansible/roles/vitrage/tasks/config.yml index eae33abb91..4d8c5faaec 100644 --- a/ansible/roles/vitrage/tasks/config.yml +++ b/ansible/roles/vitrage/tasks/config.yml @@ -112,7 +112,7 @@ volumes: "{{ item.value.volumes }}" register: check_vitrage_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ vitrage_services }}" diff --git a/ansible/roles/vitrage/tasks/main.yml b/ansible/roles/vitrage/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/vitrage/tasks/main.yml +++ b/ansible/roles/vitrage/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/vmtp/handlers/main.yml b/ansible/roles/vmtp/handlers/main.yml index 1f3fc2c578..c8ea2fe53f 100644 --- a/ansible/roles/vmtp/handlers/main.yml +++ b/ansible/roles/vmtp/handlers/main.yml @@ -11,7 +11,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - vmtp_confs.changed | bool diff --git a/ansible/roles/vmtp/tasks/config.yml b/ansible/roles/vmtp/tasks/config.yml index b107d67dfa..18a9c8eba6 100644 --- a/ansible/roles/vmtp/tasks/config.yml +++ b/ansible/roles/vmtp/tasks/config.yml @@ -51,7 +51,7 @@ volumes: "{{ item.value.volumes }}" register: check_vmtp_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ vmtp_services }}" diff --git a/ansible/roles/vmtp/tasks/main.yml b/ansible/roles/vmtp/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/vmtp/tasks/main.yml +++ b/ansible/roles/vmtp/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/watcher/handlers/main.yml b/ansible/roles/watcher/handlers/main.yml index 96898da0f7..d6512e1cae 100644 --- a/ansible/roles/watcher/handlers/main.yml +++ b/ansible/roles/watcher/handlers/main.yml @@ -14,7 +14,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -37,7 +37,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -60,7 +60,7 @@ image: "{{ service.image }}" volumes: "{{ service.volumes }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/watcher/tasks/config.yml b/ansible/roles/watcher/tasks/config.yml index d17c6d5fb7..8d9ac24978 100644 --- a/ansible/roles/watcher/tasks/config.yml +++ b/ansible/roles/watcher/tasks/config.yml @@ -90,7 +90,7 @@ volumes: "{{ item.value.volumes }}" register: check_watcher_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ watcher_services }}" diff --git a/ansible/roles/watcher/tasks/main.yml b/ansible/roles/watcher/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/watcher/tasks/main.yml +++ b/ansible/roles/watcher/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/roles/zun/handlers/main.yml b/ansible/roles/zun/handlers/main.yml index 0bd2ff85c6..5031aa8d81 100644 --- a/ansible/roles/zun/handlers/main.yml +++ b/ansible/roles/zun/handlers/main.yml @@ -15,7 +15,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool @@ -40,7 +40,7 @@ privileged: "{{ service.privileged | default(False) }}" volumes: "{{ service.volumes|reject('equalto', '')|list }}" when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[service.group] - service.enabled | bool - config_json.changed | bool diff --git a/ansible/roles/zun/tasks/config.yml b/ansible/roles/zun/tasks/config.yml index bd4c1cf2aa..1c905475ec 100644 --- a/ansible/roles/zun/tasks/config.yml +++ b/ansible/roles/zun/tasks/config.yml @@ -104,7 +104,7 @@ volumes: "{{ item.value.volumes|reject('equalto', '')|list }}" register: check_zun_containers when: - - action != "config" + - kolla_action != "config" - inventory_hostname in groups[item.value.group] - item.value.enabled | bool with_dict: "{{ zun_services }}" diff --git a/ansible/roles/zun/tasks/main.yml b/ansible/roles/zun/tasks/main.yml index b017e8b4ad..49a33b8492 100644 --- a/ansible/roles/zun/tasks/main.yml +++ b/ansible/roles/zun/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ action }}.yml" +- include: "{{ kolla_action }}.yml" diff --git a/ansible/site.yml b/ansible/site.yml index 6cbfd76be3..ff4e1b7ddc 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -6,7 +6,7 @@ # Ansible gathering facts twice. - name: Gather facts for all hosts hosts: all - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' gather_facts: false tasks: - setup: @@ -21,7 +21,7 @@ # which can be very inefficient. - name: Gather facts for all hosts (if using --limit) hosts: all - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' gather_facts: false tasks: - setup: @@ -53,14 +53,14 @@ - all roles: - role: prechecks - when: action == "precheck" + when: kolla_action == "precheck" - name: Apply role chrony gather_facts: false hosts: - chrony-server - chrony - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: chrony, tags: chrony, @@ -69,7 +69,7 @@ - name: Apply role collectd gather_facts: false hosts: collectd - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: collectd, tags: collectd, @@ -78,7 +78,7 @@ - name: Apply role zookeeper gather_facts: false hosts: zookeeper - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: zookeeper, tags: zookeeper, @@ -87,7 +87,7 @@ - name: Apply role elasticsearch gather_facts: false hosts: elasticsearch - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: elasticsearch, tags: elasticsearch, @@ -96,7 +96,7 @@ - name: Apply role influxdb gather_facts: false hosts: influxdb - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: influxdb, tags: influxdb, @@ -106,7 +106,7 @@ gather_facts: false hosts: - telegraf - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: telegraf, tags: telegraf, @@ -116,7 +116,7 @@ gather_facts: false hosts: - redis - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: redis, tags: redis, @@ -134,7 +134,7 @@ - name: Apply role kibana gather_facts: false hosts: kibana - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: kibana, tags: kibana, @@ -143,7 +143,7 @@ - name: Apply role memcached gather_facts: false hosts: memcached - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: memcached, tags: [memcache, memcached], @@ -164,7 +164,7 @@ - prometheus-node-exporter - prometheus-mysqld-exporter - prometheus-haproxy-exporter - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: prometheus, tags: prometheus, @@ -175,7 +175,7 @@ hosts: - iscsid - tgtd - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: iscsi, tags: iscsi, @@ -185,7 +185,7 @@ gather_facts: false hosts: - multipathd - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: multipathd, tags: multipathd, @@ -229,7 +229,7 @@ - name: Apply role qdrouterd gather_facts: false hosts: qdrouterd - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: qdrouterd, tags: qdrouterd, @@ -238,7 +238,7 @@ - name: Apply role etcd gather_facts: false hosts: etcd - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: etcd, tags: etcd, @@ -247,7 +247,7 @@ - name: Apply role keystone gather_facts: false hosts: keystone - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: keystone, tags: keystone, @@ -262,7 +262,7 @@ - ceph-nfs - ceph-osd - ceph-rgw - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: ceph, tags: ceph, @@ -271,7 +271,7 @@ - name: Apply role kafka gather_facts: false hosts: kafka - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: kafka, tags: kafka, @@ -280,7 +280,7 @@ - name: Apply role karbor gather_facts: false hosts: karbor - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: karbor, tags: karbor, @@ -293,7 +293,7 @@ - swift-container-server - swift-object-server - swift-proxy-server - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: swift, tags: swift, @@ -305,7 +305,7 @@ - ceph-mon - glance-api - glance-registry - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: glance, tags: glance, @@ -318,7 +318,7 @@ - ironic-conductor - ironic-inspector - ironic-pxe - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: ironic, tags: ironic, @@ -332,7 +332,7 @@ - cinder-backup - cinder-scheduler - cinder-volume - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: cinder, tags: cinder, @@ -348,7 +348,7 @@ - nova-consoleauth - nova-novncproxy - nova-scheduler - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: nova, tags: nova, @@ -357,7 +357,7 @@ - name: Apply role opendaylight gather_facts: false hosts: opendaylight - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: opendaylight, tags: opendaylight, @@ -367,7 +367,7 @@ gather_facts: false hosts: - openvswitch - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: openvswitch, tags: openvswitch, @@ -377,7 +377,7 @@ gather_facts: false hosts: - openvswitch - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: ovs-dpdk, tags: ovs-dpdk, @@ -387,7 +387,7 @@ gather_facts: false hosts: - hyperv - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: nova-hyperv, tags: nova-hyperv, @@ -405,7 +405,7 @@ - neutron-metadata-agent - compute - manila-share - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: neutron, tags: neutron, @@ -415,7 +415,7 @@ gather_facts: false hosts: - compute - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: kuryr, tags: kuryr, @@ -427,7 +427,7 @@ - heat-api - heat-api-cfn - heat-engine - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: heat, tags: heat, @@ -437,7 +437,7 @@ gather_facts: false hosts: - horizon - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: horizon, tags: horizon, @@ -448,7 +448,7 @@ hosts: - murano-api - murano-engine - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: murano, tags: murano, @@ -461,7 +461,7 @@ - solum-worker - solum-deployer - solum-conductor - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: solum, tags: solum, @@ -472,7 +472,7 @@ hosts: - magnum-api - magnum-conductor - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: magnum, tags: magnum, @@ -484,7 +484,7 @@ - mistral-api - mistral-engine - mistral-executor - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: mistral, tags: mistral, @@ -495,7 +495,7 @@ hosts: - sahara-api - sahara-engine - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: sahara, tags: sahara, @@ -505,7 +505,7 @@ gather_facts: false hosts: - mongodb - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: mongodb, tags: mongodb, @@ -514,7 +514,7 @@ - name: Apply role panko gather_facts: false hosts: panko-api - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: panko, tags: panko, @@ -528,7 +528,7 @@ - manila-data - manila-share - manila-scheduler - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: manila, tags: manila, @@ -541,7 +541,7 @@ - gnocchi-api - gnocchi-metricd - gnocchi-statsd - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: gnocchi, tags: gnocchi, @@ -554,7 +554,7 @@ hosts: - ceilometer - compute - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: ceilometer, tags: ceilometer, @@ -564,7 +564,7 @@ gather_facts: false hosts: - aodh - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: aodh, tags: aodh, @@ -576,7 +576,7 @@ - barbican-api - barbican-keystone-listener - barbican-worker - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: barbican, tags: barbican, @@ -588,7 +588,7 @@ - congress-api - congress-policy-engine - congress-datasource - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: congress, tags: congress, @@ -598,7 +598,7 @@ gather_facts: false hosts: - tempest - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: tempest, tags: tempest, @@ -614,7 +614,7 @@ - designate-worker - designate-sink - designate-backend-bind9 - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: designate, tags: designate, @@ -623,7 +623,7 @@ - name: Apply role rally gather_facts: false hosts: rally - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: rally, tags: rally, @@ -633,7 +633,7 @@ gather_facts: false hosts: - vmtp - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: vmtp, tags: vmtp, @@ -645,7 +645,7 @@ - trove-api - trove-conductor - trove-taskmanager - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: trove, tags: trove, @@ -657,7 +657,7 @@ - watcher-api - watcher-engine - watcher-applier - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: watcher, tags: watcher, @@ -667,7 +667,7 @@ gather_facts: false hosts: - grafana - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: grafana, tags: grafana, @@ -678,7 +678,7 @@ hosts: - cloudkitty-api - cloudkitty-processor - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: cloudkitty, tags: cloudkitty, @@ -688,7 +688,7 @@ gather_facts: false hosts: - freezer-api - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: freezer, tags: freezer, @@ -699,7 +699,7 @@ hosts: - senlin-api - senlin-engine - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: senlin, tags: senlin, @@ -710,7 +710,7 @@ hosts: - searchlight-api - searchlight-listener - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: searchlight, tags: searchlight, @@ -721,7 +721,7 @@ hosts: - tacker-server - tacker-conductor - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: tacker, tags: tacker, @@ -734,7 +734,7 @@ - octavia-health-manager - octavia-housekeeping - octavia-worker - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: octavia, tags: octavia, @@ -745,7 +745,7 @@ hosts: - zun-api - zun-compute - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: zun, tags: zun, @@ -756,7 +756,7 @@ hosts: - skydive-agent - skydive-analyzer - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: skydive, tags: skydive, @@ -770,7 +770,7 @@ - vitrage-notifier - vitrage-collector - vitrage-ml - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: vitrage, tags: vitrage, @@ -781,7 +781,7 @@ hosts: - blazar-api - blazar-manager - serial: '{{ serial|default("0") }}' + serial: '{{ kolla_serial|default("0") }}' roles: - { role: blazar, tags: blazar, diff --git a/releasenotes/notes/fix-ansible-warning-f9b382a13446f625.yaml b/releasenotes/notes/fix-ansible-warning-f9b382a13446f625.yaml new file mode 100644 index 0000000000..139d0906b5 --- /dev/null +++ b/releasenotes/notes/fix-ansible-warning-f9b382a13446f625.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - fixed ansible warning when using ansible>2.2 + - avoid using ansible reserved action and serial word in playbooks. use kolla_action and + kolla_serial instead. diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 72d8e86c8b..28435f6b57 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -231,15 +231,15 @@ case "$1" in (prechecks) ACTION="Pre-deployment checking" - EXTRA_OPTS="$EXTRA_OPTS -e action=precheck" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=precheck" ;; (check) ACTION="Post-deployment checking" - EXTRA_OPTS="$EXTRA_OPTS -e action=check" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=check" ;; (mariadb_recovery) ACTION="Attempting to restart mariadb cluster" - EXTRA_OPTS="$EXTRA_OPTS -e action=deploy -e common_run=true" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=deploy -e common_run=true" PLAYBOOK="${BASEDIR}/ansible/mariadb_recovery.yml" ;; (destroy) @@ -264,21 +264,21 @@ EOF (bootstrap-servers) ACTION="Bootstraping servers" PLAYBOOK="${BASEDIR}/ansible/kolla-host.yml" - EXTRA_OPTS="$EXTRA_OPTS -e action=bootstrap-servers" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=bootstrap-servers" ;; (deploy) ACTION="Deploying Playbooks" - EXTRA_OPTS="$EXTRA_OPTS -e action=deploy" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=deploy" ;; (deploy-bifrost) ACTION="Deploying Bifrost" PLAYBOOK="${BASEDIR}/ansible/bifrost.yml" - EXTRA_OPTS="$EXTRA_OPTS -e action=deploy" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=deploy" ;; (deploy-servers) ACTION="Deploying servers with bifrost" PLAYBOOK="${BASEDIR}/ansible/bifrost.yml" - EXTRA_OPTS="$EXTRA_OPTS -e action=deploy-servers" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=deploy-servers" ;; (post-deploy) ACTION="Post-Deploying Playbooks" @@ -286,15 +286,15 @@ EOF ;; (pull) ACTION="Pulling Docker images" - EXTRA_OPTS="$EXTRA_OPTS -e action=pull" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=pull" ;; (upgrade) ACTION="Upgrading OpenStack Environment" - EXTRA_OPTS="$EXTRA_OPTS -e action=upgrade -e serial=${ANSIBLE_SERIAL}" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=upgrade -e kolla_serial=${ANSIBLE_SERIAL}" ;; (reconfigure) ACTION="Reconfigure OpenStack service" - EXTRA_OPTS="$EXTRA_OPTS -e action=reconfigure -e serial=${ANSIBLE_SERIAL}" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=reconfigure -e kolla_serial=${ANSIBLE_SERIAL}" ;; (stop) ACTION="Stop Kolla containers" @@ -306,7 +306,7 @@ EOF ;; (genconfig) ACTION="Generate configuration files for enabled OpenStack services" - EXTRA_OPTS="$EXTRA_OPTS -e action=config" + EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=config" ;; (bash-completion) bash_completion