From b51eeed89ebec17fc258d97a2d4300dd981450af Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Mon, 23 Jul 2018 12:58:02 +0800 Subject: [PATCH] Use include_tasks instead of include include is marked as deprecated since ansible 2.4[0] [0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated Co-Authored-By: confi-surya Change-Id: Ic9d71e1865d1c728890625aeddf424a5734c0a8a --- ansible/roles/aodh/tasks/bootstrap.yml | 2 +- ansible/roles/aodh/tasks/deploy.yml | 8 +++---- ansible/roles/aodh/tasks/main.yml | 2 +- ansible/roles/aodh/tasks/reconfigure.yml | 2 +- ansible/roles/aodh/tasks/upgrade.yml | 4 ++-- ansible/roles/barbican/tasks/bootstrap.yml | 2 +- ansible/roles/barbican/tasks/deploy.yml | 8 +++---- ansible/roles/barbican/tasks/main.yml | 2 +- ansible/roles/barbican/tasks/reconfigure.yml | 2 +- ansible/roles/barbican/tasks/upgrade.yml | 4 ++-- .../baremetal/tasks/bootstrap-servers.yml | 6 ++--- ansible/roles/baremetal/tasks/main.yml | 2 +- ansible/roles/bifrost/tasks/deploy.yml | 6 ++--- ansible/roles/bifrost/tasks/main.yml | 2 +- ansible/roles/bifrost/tasks/reconfigure.yml | 4 ++-- ansible/roles/bifrost/tasks/upgrade.yml | 4 ++-- ansible/roles/blazar/tasks/bootstrap.yml | 2 +- ansible/roles/blazar/tasks/deploy.yml | 8 +++---- ansible/roles/blazar/tasks/main.yml | 2 +- ansible/roles/blazar/tasks/reconfigure.yml | 2 +- ansible/roles/blazar/tasks/upgrade.yml | 4 ++-- ansible/roles/ceilometer/tasks/bootstrap.yml | 2 +- ansible/roles/ceilometer/tasks/deploy.yml | 8 +++---- ansible/roles/ceilometer/tasks/main.yml | 2 +- .../roles/ceilometer/tasks/reconfigure.yml | 2 +- ansible/roles/ceilometer/tasks/upgrade.yml | 4 ++-- ansible/roles/ceph/tasks/bootstrap_mons.yml | 2 +- ansible/roles/ceph/tasks/deploy.yml | 24 +++++++++---------- ansible/roles/ceph/tasks/generate_cluster.yml | 2 +- ansible/roles/ceph/tasks/main.yml | 2 +- ansible/roles/ceph/tasks/reconfigure.yml | 8 +++---- ansible/roles/ceph/tasks/start_mdss.yml | 2 +- ansible/roles/ceph/tasks/upgrade.yml | 14 +++++------ ansible/roles/certificates/tasks/main.yml | 2 +- ansible/roles/chrony/tasks/deploy.yml | 2 +- ansible/roles/chrony/tasks/main.yml | 2 +- ansible/roles/chrony/tasks/reconfigure.yml | 2 +- ansible/roles/chrony/tasks/upgrade.yml | 2 +- ansible/roles/cinder/tasks/bootstrap.yml | 2 +- ansible/roles/cinder/tasks/ceph.yml | 4 ++-- ansible/roles/cinder/tasks/deploy.yml | 14 +++++------ ansible/roles/cinder/tasks/main.yml | 2 +- ansible/roles/cinder/tasks/reconfigure.yml | 2 +- ansible/roles/cinder/tasks/upgrade.yml | 10 ++++---- ansible/roles/cloudkitty/tasks/bootstrap.yml | 2 +- ansible/roles/cloudkitty/tasks/deploy.yml | 8 +++---- ansible/roles/cloudkitty/tasks/main.yml | 2 +- .../roles/cloudkitty/tasks/reconfigure.yml | 2 +- ansible/roles/cloudkitty/tasks/upgrade.yml | 4 ++-- ansible/roles/collectd/tasks/deploy.yml | 2 +- ansible/roles/collectd/tasks/main.yml | 2 +- ansible/roles/collectd/tasks/reconfigure.yml | 2 +- ansible/roles/collectd/tasks/upgrade.yml | 2 +- ansible/roles/common/tasks/deploy.yml | 4 ++-- ansible/roles/common/tasks/main.yml | 2 +- ansible/roles/common/tasks/reconfigure.yml | 2 +- ansible/roles/common/tasks/upgrade.yml | 2 +- ansible/roles/congress/tasks/bootstrap.yml | 2 +- ansible/roles/congress/tasks/deploy.yml | 8 +++---- ansible/roles/congress/tasks/main.yml | 2 +- ansible/roles/congress/tasks/reconfigure.yml | 2 +- ansible/roles/congress/tasks/upgrade.yml | 4 ++-- ansible/roles/designate/tasks/bootstrap.yml | 2 +- ansible/roles/designate/tasks/config.yml | 2 +- ansible/roles/designate/tasks/deploy.yml | 10 ++++---- ansible/roles/designate/tasks/main.yml | 2 +- ansible/roles/designate/tasks/reconfigure.yml | 2 +- ansible/roles/designate/tasks/upgrade.yml | 6 ++--- ansible/roles/destroy/tasks/main.yml | 8 +++---- ansible/roles/elasticsearch/tasks/deploy.yml | 2 +- ansible/roles/elasticsearch/tasks/main.yml | 2 +- .../roles/elasticsearch/tasks/reconfigure.yml | 2 +- ansible/roles/elasticsearch/tasks/upgrade.yml | 2 +- ansible/roles/etcd/tasks/deploy.yml | 2 +- ansible/roles/etcd/tasks/main.yml | 2 +- ansible/roles/etcd/tasks/reconfigure.yml | 2 +- ansible/roles/etcd/tasks/upgrade.yml | 2 +- ansible/roles/freezer/tasks/deploy.yml | 6 ++--- ansible/roles/freezer/tasks/main.yml | 2 +- ansible/roles/freezer/tasks/reconfigure.yml | 2 +- ansible/roles/freezer/tasks/upgrade.yml | 4 ++-- ansible/roles/glance/tasks/bootstrap.yml | 2 +- ansible/roles/glance/tasks/ceph.yml | 2 +- ansible/roles/glance/tasks/config.yml | 4 ++-- ansible/roles/glance/tasks/deploy.yml | 10 ++++---- ansible/roles/glance/tasks/legacy_upgrade.yml | 4 ++-- ansible/roles/glance/tasks/main.yml | 2 +- ansible/roles/glance/tasks/reconfigure.yml | 2 +- .../roles/glance/tasks/rolling_upgrade.yml | 10 ++++---- ansible/roles/glance/tasks/upgrade.yml | 4 ++-- ansible/roles/gnocchi/tasks/bootstrap.yml | 2 +- ansible/roles/gnocchi/tasks/ceph.yml | 2 +- ansible/roles/gnocchi/tasks/deploy.yml | 10 ++++---- ansible/roles/gnocchi/tasks/main.yml | 2 +- ansible/roles/gnocchi/tasks/reconfigure.yml | 2 +- ansible/roles/gnocchi/tasks/upgrade.yml | 4 ++-- ansible/roles/grafana/tasks/deploy.yml | 6 ++--- ansible/roles/grafana/tasks/main.yml | 2 +- ansible/roles/grafana/tasks/reconfigure.yml | 2 +- ansible/roles/grafana/tasks/upgrade.yml | 2 +- ansible/roles/haproxy/tasks/deploy.yml | 2 +- ansible/roles/haproxy/tasks/main.yml | 2 +- ansible/roles/haproxy/tasks/reconfigure.yml | 2 +- ansible/roles/haproxy/tasks/upgrade.yml | 2 +- ansible/roles/heat/tasks/bootstrap.yml | 2 +- ansible/roles/heat/tasks/deploy.yml | 8 +++---- ansible/roles/heat/tasks/main.yml | 2 +- ansible/roles/heat/tasks/reconfigure.yml | 2 +- ansible/roles/heat/tasks/upgrade.yml | 4 ++-- ansible/roles/horizon/tasks/bootstrap.yml | 2 +- ansible/roles/horizon/tasks/config.yml | 2 +- ansible/roles/horizon/tasks/deploy.yml | 6 ++--- ansible/roles/horizon/tasks/main.yml | 2 +- ansible/roles/horizon/tasks/reconfigure.yml | 2 +- ansible/roles/horizon/tasks/upgrade.yml | 6 ++--- ansible/roles/influxdb/tasks/deploy.yml | 2 +- ansible/roles/influxdb/tasks/main.yml | 2 +- ansible/roles/influxdb/tasks/reconfigure.yml | 2 +- ansible/roles/influxdb/tasks/upgrade.yml | 2 +- ansible/roles/ironic/tasks/bootstrap.yml | 2 +- ansible/roles/ironic/tasks/deploy.yml | 8 +++---- ansible/roles/ironic/tasks/legacy_upgrade.yml | 4 ++-- ansible/roles/ironic/tasks/main.yml | 2 +- ansible/roles/ironic/tasks/reconfigure.yml | 2 +- .../roles/ironic/tasks/rolling_upgrade.yml | 8 +++---- ansible/roles/ironic/tasks/upgrade.yml | 4 ++-- ansible/roles/iscsi/tasks/deploy.yml | 4 ++-- ansible/roles/iscsi/tasks/main.yml | 2 +- ansible/roles/iscsi/tasks/upgrade.yml | 4 ++-- ansible/roles/kafka/tasks/deploy.yml | 2 +- ansible/roles/kafka/tasks/main.yml | 2 +- ansible/roles/kafka/tasks/reconfigure.yml | 2 +- ansible/roles/kafka/tasks/upgrade.yml | 2 +- ansible/roles/karbor/tasks/bootstrap.yml | 2 +- ansible/roles/karbor/tasks/deploy.yml | 6 ++--- ansible/roles/karbor/tasks/main.yml | 2 +- ansible/roles/karbor/tasks/reconfigure.yml | 2 +- ansible/roles/karbor/tasks/upgrade.yml | 4 ++-- ansible/roles/keystone/tasks/bootstrap.yml | 2 +- ansible/roles/keystone/tasks/deploy.yml | 12 +++++----- ansible/roles/keystone/tasks/main.yml | 2 +- ansible/roles/keystone/tasks/reconfigure.yml | 2 +- ansible/roles/keystone/tasks/upgrade.yml | 2 +- ansible/roles/kibana/tasks/deploy.yml | 4 ++-- ansible/roles/kibana/tasks/main.yml | 2 +- ansible/roles/kibana/tasks/reconfigure.yml | 2 +- ansible/roles/kibana/tasks/upgrade.yml | 2 +- ansible/roles/kuryr/tasks/deploy.yml | 6 ++--- ansible/roles/kuryr/tasks/main.yml | 2 +- ansible/roles/kuryr/tasks/reconfigure.yml | 2 +- ansible/roles/kuryr/tasks/upgrade.yml | 2 +- ansible/roles/magnum/tasks/bootstrap.yml | 2 +- ansible/roles/magnum/tasks/deploy.yml | 8 +++---- ansible/roles/magnum/tasks/main.yml | 2 +- ansible/roles/magnum/tasks/reconfigure.yml | 2 +- ansible/roles/magnum/tasks/upgrade.yml | 4 ++-- ansible/roles/manila/tasks/bootstrap.yml | 2 +- ansible/roles/manila/tasks/deploy.yml | 14 +++++------ ansible/roles/manila/tasks/main.yml | 2 +- ansible/roles/manila/tasks/reconfigure.yml | 2 +- ansible/roles/manila/tasks/upgrade.yml | 4 ++-- ansible/roles/mariadb/tasks/bootstrap.yml | 6 ++--- ansible/roles/mariadb/tasks/deploy.yml | 8 +++---- ansible/roles/mariadb/tasks/main.yml | 2 +- ansible/roles/mariadb/tasks/reconfigure.yml | 2 +- ansible/roles/mariadb/tasks/upgrade.yml | 2 +- ansible/roles/memcached/tasks/deploy.yml | 2 +- ansible/roles/memcached/tasks/main.yml | 2 +- ansible/roles/memcached/tasks/reconfigure.yml | 2 +- ansible/roles/memcached/tasks/upgrade.yml | 2 +- ansible/roles/mistral/tasks/bootstrap.yml | 2 +- ansible/roles/mistral/tasks/deploy.yml | 8 +++---- ansible/roles/mistral/tasks/main.yml | 2 +- ansible/roles/mistral/tasks/reconfigure.yml | 2 +- ansible/roles/mistral/tasks/upgrade.yml | 4 ++-- ansible/roles/monasca/tasks/bootstrap.yml | 2 +- ansible/roles/monasca/tasks/deploy.yml | 8 +++---- ansible/roles/monasca/tasks/main.yml | 2 +- ansible/roles/monasca/tasks/reconfigure.yml | 2 +- ansible/roles/monasca/tasks/upgrade.yml | 2 +- ansible/roles/mongodb/handlers/main.yml | 2 +- ansible/roles/mongodb/tasks/deploy.yml | 4 ++-- ansible/roles/mongodb/tasks/main.yml | 2 +- ansible/roles/mongodb/tasks/reconfigure.yml | 2 +- ansible/roles/mongodb/tasks/upgrade.yml | 2 +- ansible/roles/multipathd/tasks/deploy.yml | 4 ++-- ansible/roles/multipathd/tasks/main.yml | 2 +- ansible/roles/multipathd/tasks/upgrade.yml | 4 ++-- ansible/roles/murano/tasks/bootstrap.yml | 2 +- ansible/roles/murano/tasks/deploy.yml | 10 ++++---- ansible/roles/murano/tasks/main.yml | 2 +- ansible/roles/murano/tasks/reconfigure.yml | 2 +- ansible/roles/murano/tasks/upgrade.yml | 6 ++--- ansible/roles/neutron/tasks/bootstrap.yml | 2 +- ansible/roles/neutron/tasks/deploy.yml | 10 ++++---- ansible/roles/neutron/tasks/main.yml | 2 +- ansible/roles/neutron/tasks/reconfigure.yml | 2 +- ansible/roles/neutron/tasks/upgrade.yml | 6 ++--- ansible/roles/nova-hyperv/tasks/deploy.yml | 4 ++-- ansible/roles/nova-hyperv/tasks/main.yml | 2 +- .../roles/nova-hyperv/tasks/reconfigure.yml | 2 +- ansible/roles/nova/tasks/bootstrap.yml | 2 +- ansible/roles/nova/tasks/ceph.yml | 2 +- ansible/roles/nova/tasks/deploy.yml | 16 ++++++------- ansible/roles/nova/tasks/main.yml | 2 +- ansible/roles/nova/tasks/reconfigure.yml | 2 +- .../roles/nova/tasks/simple_cell_setup.yml | 2 +- ansible/roles/nova/tasks/upgrade.yml | 6 ++--- ansible/roles/octavia/tasks/bootstrap.yml | 2 +- ansible/roles/octavia/tasks/deploy.yml | 6 ++--- ansible/roles/octavia/tasks/main.yml | 2 +- ansible/roles/octavia/tasks/reconfigure.yml | 2 +- ansible/roles/octavia/tasks/upgrade.yml | 4 ++-- ansible/roles/opendaylight/tasks/deploy.yml | 2 +- ansible/roles/opendaylight/tasks/main.yml | 2 +- .../roles/opendaylight/tasks/reconfigure.yml | 2 +- ansible/roles/opendaylight/tasks/upgrade.yml | 2 +- ansible/roles/openvswitch/tasks/deploy.yml | 2 +- ansible/roles/openvswitch/tasks/main.yml | 2 +- .../roles/openvswitch/tasks/reconfigure.yml | 2 +- ansible/roles/openvswitch/tasks/upgrade.yml | 2 +- ansible/roles/ovs-dpdk/tasks/deploy.yml | 2 +- ansible/roles/ovs-dpdk/tasks/main.yml | 2 +- ansible/roles/ovs-dpdk/tasks/reconfigure.yml | 2 +- ansible/roles/ovs-dpdk/tasks/upgrade.yml | 2 +- ansible/roles/panko/tasks/bootstrap.yml | 2 +- ansible/roles/panko/tasks/deploy.yml | 6 ++--- ansible/roles/panko/tasks/main.yml | 2 +- ansible/roles/panko/tasks/reconfigure.yml | 2 +- ansible/roles/panko/tasks/upgrade.yml | 4 ++-- ansible/roles/prechecks/tasks/main.yml | 10 ++++---- ansible/roles/prometheus/tasks/deploy.yml | 4 ++-- ansible/roles/prometheus/tasks/main.yml | 2 +- .../roles/prometheus/tasks/reconfigure.yml | 2 +- ansible/roles/prometheus/tasks/upgrade.yml | 2 +- ansible/roles/qdrouterd/tasks/deploy.yml | 4 ++-- ansible/roles/qdrouterd/tasks/main.yml | 2 +- ansible/roles/qdrouterd/tasks/reconfigure.yml | 2 +- ansible/roles/qdrouterd/tasks/upgrade.yml | 2 +- ansible/roles/rabbitmq/tasks/deploy.yml | 4 ++-- ansible/roles/rabbitmq/tasks/main.yml | 2 +- ansible/roles/rabbitmq/tasks/reconfigure.yml | 2 +- ansible/roles/rabbitmq/tasks/upgrade.yml | 2 +- ansible/roles/rally/tasks/bootstrap.yml | 2 +- ansible/roles/rally/tasks/deploy.yml | 4 ++-- ansible/roles/rally/tasks/main.yml | 2 +- ansible/roles/rally/tasks/reconfigure.yml | 2 +- ansible/roles/rally/tasks/upgrade.yml | 4 ++-- ansible/roles/redis/tasks/deploy.yml | 2 +- ansible/roles/redis/tasks/main.yml | 2 +- ansible/roles/redis/tasks/reconfigure.yml | 2 +- ansible/roles/redis/tasks/upgrade.yml | 2 +- ansible/roles/sahara/tasks/bootstrap.yml | 2 +- ansible/roles/sahara/tasks/deploy.yml | 8 +++---- ansible/roles/sahara/tasks/main.yml | 2 +- ansible/roles/sahara/tasks/reconfigure.yml | 2 +- ansible/roles/sahara/tasks/upgrade.yml | 4 ++-- ansible/roles/searchlight/tasks/bootstrap.yml | 2 +- ansible/roles/searchlight/tasks/deploy.yml | 6 ++--- ansible/roles/searchlight/tasks/main.yml | 2 +- .../roles/searchlight/tasks/reconfigure.yml | 2 +- ansible/roles/searchlight/tasks/upgrade.yml | 4 ++-- ansible/roles/senlin/tasks/bootstrap.yml | 2 +- ansible/roles/senlin/tasks/deploy.yml | 8 +++---- ansible/roles/senlin/tasks/main.yml | 2 +- ansible/roles/senlin/tasks/reconfigure.yml | 2 +- ansible/roles/senlin/tasks/upgrade.yml | 4 ++-- ansible/roles/skydive/tasks/deploy.yml | 2 +- ansible/roles/skydive/tasks/main.yml | 2 +- ansible/roles/skydive/tasks/reconfigure.yml | 2 +- ansible/roles/skydive/tasks/upgrade.yml | 2 +- ansible/roles/solum/tasks/bootstrap.yml | 2 +- ansible/roles/solum/tasks/deploy.yml | 8 +++---- ansible/roles/solum/tasks/main.yml | 2 +- ansible/roles/solum/tasks/reconfigure.yml | 2 +- ansible/roles/solum/tasks/upgrade.yml | 4 ++-- ansible/roles/stop/tasks/main.yml | 4 ++-- ansible/roles/swift/tasks/deploy.yml | 8 +++---- ansible/roles/swift/tasks/main.yml | 2 +- ansible/roles/swift/tasks/reconfigure.yml | 4 ++-- ansible/roles/swift/tasks/stop_and_start.yml | 2 +- ansible/roles/swift/tasks/upgrade.yml | 4 ++-- ansible/roles/tacker/tasks/bootstrap.yml | 2 +- ansible/roles/tacker/tasks/deploy.yml | 8 +++---- ansible/roles/tacker/tasks/main.yml | 2 +- ansible/roles/tacker/tasks/reconfigure.yml | 2 +- ansible/roles/tacker/tasks/upgrade.yml | 4 ++-- ansible/roles/telegraf/tasks/deploy.yml | 2 +- ansible/roles/telegraf/tasks/main.yml | 2 +- ansible/roles/telegraf/tasks/reconfigure.yml | 2 +- ansible/roles/telegraf/tasks/upgrade.yml | 2 +- ansible/roles/tempest/tasks/deploy.yml | 2 +- ansible/roles/tempest/tasks/main.yml | 2 +- ansible/roles/tempest/tasks/reconfigure.yml | 2 +- ansible/roles/tempest/tasks/upgrade.yml | 2 +- ansible/roles/trove/tasks/bootstrap.yml | 2 +- ansible/roles/trove/tasks/deploy.yml | 8 +++---- ansible/roles/trove/tasks/main.yml | 2 +- ansible/roles/trove/tasks/reconfigure.yml | 2 +- ansible/roles/trove/tasks/upgrade.yml | 4 ++-- ansible/roles/vitrage/tasks/bootstrap.yml | 2 +- ansible/roles/vitrage/tasks/deploy.yml | 8 +++---- ansible/roles/vitrage/tasks/main.yml | 2 +- ansible/roles/vitrage/tasks/reconfigure.yml | 2 +- ansible/roles/vitrage/tasks/upgrade.yml | 4 ++-- ansible/roles/vmtp/tasks/deploy.yml | 2 +- ansible/roles/vmtp/tasks/main.yml | 2 +- ansible/roles/vmtp/tasks/reconfigure.yml | 2 +- ansible/roles/vmtp/tasks/upgrade.yml | 2 +- ansible/roles/watcher/tasks/bootstrap.yml | 2 +- ansible/roles/watcher/tasks/deploy.yml | 8 +++---- ansible/roles/watcher/tasks/main.yml | 2 +- ansible/roles/watcher/tasks/reconfigure.yml | 2 +- ansible/roles/watcher/tasks/upgrade.yml | 4 ++-- ansible/roles/zookeeper/tasks/deploy.yml | 2 +- ansible/roles/zookeeper/tasks/main.yml | 2 +- ansible/roles/zookeeper/tasks/reconfigure.yml | 2 +- ansible/roles/zookeeper/tasks/upgrade.yml | 2 +- ansible/roles/zun/tasks/bootstrap.yml | 2 +- ansible/roles/zun/tasks/deploy.yml | 8 +++---- ansible/roles/zun/tasks/main.yml | 2 +- ansible/roles/zun/tasks/reconfigure.yml | 2 +- ansible/roles/zun/tasks/upgrade.yml | 4 ++-- tools/setup_gate.sh | 2 +- 324 files changed, 549 insertions(+), 549 deletions(-) diff --git a/ansible/roles/aodh/tasks/bootstrap.yml b/ansible/roles/aodh/tasks/bootstrap.yml index c4d38ef409..daf9c5f493 100644 --- a/ansible/roles/aodh/tasks/bootstrap.yml +++ b/ansible/roles/aodh/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/aodh/tasks/deploy.yml b/ansible/roles/aodh/tasks/deploy.yml index a1fdd905a6..c866c1e26a 100644 --- a/ansible/roles/aodh/tasks/deploy.yml +++ b/ansible/roles/aodh/tasks/deploy.yml @@ -1,17 +1,17 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['aodh-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['aodh-api'] or inventory_hostname in groups['aodh-evaluator'] or inventory_hostname in groups['aodh-listener'] or inventory_hostname in groups['aodh-notifier'] -- include: clone.yml +- include_tasks: clone.yml when: aodh_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['aodh-api'] - name: Flush handlers diff --git a/ansible/roles/aodh/tasks/main.yml b/ansible/roles/aodh/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/aodh/tasks/main.yml +++ b/ansible/roles/aodh/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/aodh/tasks/reconfigure.yml b/ansible/roles/aodh/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/aodh/tasks/reconfigure.yml +++ b/ansible/roles/aodh/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/aodh/tasks/upgrade.yml b/ansible/roles/aodh/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/aodh/tasks/upgrade.yml +++ b/ansible/roles/aodh/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/barbican/tasks/bootstrap.yml b/ansible/roles/barbican/tasks/bootstrap.yml index adecdf0faf..ba5a6091d9 100644 --- a/ansible/roles/barbican/tasks/bootstrap.yml +++ b/ansible/roles/barbican/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/barbican/tasks/deploy.yml b/ansible/roles/barbican/tasks/deploy.yml index 7990dda9c5..26b9bb9273 100644 --- a/ansible/roles/barbican/tasks/deploy.yml +++ b/ansible/roles/barbican/tasks/deploy.yml @@ -1,16 +1,16 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['barbican-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['barbican-api'] or inventory_hostname in groups['barbican-worker'] or inventory_hostname in groups['barbican-keystone-listener'] -- include: clone.yml +- include_tasks: clone.yml when: barbican_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['barbican-api'] - name: Flush handlers diff --git a/ansible/roles/barbican/tasks/main.yml b/ansible/roles/barbican/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/barbican/tasks/main.yml +++ b/ansible/roles/barbican/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/barbican/tasks/reconfigure.yml b/ansible/roles/barbican/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/barbican/tasks/reconfigure.yml +++ b/ansible/roles/barbican/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/barbican/tasks/upgrade.yml b/ansible/roles/barbican/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/barbican/tasks/upgrade.yml +++ b/ansible/roles/barbican/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/baremetal/tasks/bootstrap-servers.yml b/ansible/roles/baremetal/tasks/bootstrap-servers.yml index 89d20ba267..efe2e3cdb5 100644 --- a/ansible/roles/baremetal/tasks/bootstrap-servers.yml +++ b/ansible/roles/baremetal/tasks/bootstrap-servers.yml @@ -1,6 +1,6 @@ --- -- include: pre-install.yml +- include_tasks: pre-install.yml -- include: install.yml +- include_tasks: install.yml -- include: post-install.yml +- include_tasks: post-install.yml diff --git a/ansible/roles/baremetal/tasks/main.yml b/ansible/roles/baremetal/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/baremetal/tasks/main.yml +++ b/ansible/roles/baremetal/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/bifrost/tasks/deploy.yml b/ansible/roles/bifrost/tasks/deploy.yml index fe58cc3f76..93c1efe7c8 100644 --- a/ansible/roles/bifrost/tasks/deploy.yml +++ b/ansible/roles/bifrost/tasks/deploy.yml @@ -1,6 +1,6 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: start.yml +- include_tasks: start.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml diff --git a/ansible/roles/bifrost/tasks/main.yml b/ansible/roles/bifrost/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/bifrost/tasks/main.yml +++ b/ansible/roles/bifrost/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/bifrost/tasks/reconfigure.yml b/ansible/roles/bifrost/tasks/reconfigure.yml index 17f2bd129b..2d8ade0733 100644 --- a/ansible/roles/bifrost/tasks/reconfigure.yml +++ b/ansible/roles/bifrost/tasks/reconfigure.yml @@ -10,7 +10,7 @@ with_items: - { name: bifrost-deploy, group: bifrost-deploy } -- include: config.yml +- include_tasks: config.yml - name: Check the configs command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check @@ -49,7 +49,7 @@ - "{{ container_envs.results }}" - "{{ check_results.results }}" -- include: start.yml +- include_tasks: start.yml when: remove_containers.changed - name: Restart containers diff --git a/ansible/roles/bifrost/tasks/upgrade.yml b/ansible/roles/bifrost/tasks/upgrade.yml index 1f16915ad9..fae82a1da6 100644 --- a/ansible/roles/bifrost/tasks/upgrade.yml +++ b/ansible/roles/bifrost/tasks/upgrade.yml @@ -1,4 +1,4 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: start.yml +- include_tasks: start.yml diff --git a/ansible/roles/blazar/tasks/bootstrap.yml b/ansible/roles/blazar/tasks/bootstrap.yml index 89e32de338..358f190538 100644 --- a/ansible/roles/blazar/tasks/bootstrap.yml +++ b/ansible/roles/blazar/tasks/bootstrap.yml @@ -50,5 +50,5 @@ run_once: True delegate_to: "{{ groups['blazar-api'][0] }}" -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed diff --git a/ansible/roles/blazar/tasks/deploy.yml b/ansible/roles/blazar/tasks/deploy.yml index fa2fb2ef2b..a05a8e0266 100644 --- a/ansible/roles/blazar/tasks/deploy.yml +++ b/ansible/roles/blazar/tasks/deploy.yml @@ -1,15 +1,15 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['blazar-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['blazar-api'] or inventory_hostname in groups['blazar-manager'] -- include: clone.yml +- include_tasks: clone.yml when: blazar_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['blazar-api'] - name: Flush handlers diff --git a/ansible/roles/blazar/tasks/main.yml b/ansible/roles/blazar/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/blazar/tasks/main.yml +++ b/ansible/roles/blazar/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/blazar/tasks/reconfigure.yml b/ansible/roles/blazar/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/blazar/tasks/reconfigure.yml +++ b/ansible/roles/blazar/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/blazar/tasks/upgrade.yml b/ansible/roles/blazar/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/blazar/tasks/upgrade.yml +++ b/ansible/roles/blazar/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ceilometer/tasks/bootstrap.yml b/ansible/roles/ceilometer/tasks/bootstrap.yml index 22ec22504e..f718d4e626 100644 --- a/ansible/roles/ceilometer/tasks/bootstrap.yml +++ b/ansible/roles/ceilometer/tasks/bootstrap.yml @@ -1,3 +1,3 @@ --- # TODO(Jeffrey4l): fix idempotent -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml diff --git a/ansible/roles/ceilometer/tasks/deploy.yml b/ansible/roles/ceilometer/tasks/deploy.yml index f9b3659b23..3e282bd664 100644 --- a/ansible/roles/ceilometer/tasks/deploy.yml +++ b/ansible/roles/ceilometer/tasks/deploy.yml @@ -1,15 +1,15 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['ceilometer'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['ceilometer'] or inventory_hostname in groups['compute'] -- include: clone.yml +- include_tasks: clone.yml when: ceilometer_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['ceilometer'] - name: Flush handlers diff --git a/ansible/roles/ceilometer/tasks/main.yml b/ansible/roles/ceilometer/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/ceilometer/tasks/main.yml +++ b/ansible/roles/ceilometer/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ceilometer/tasks/reconfigure.yml b/ansible/roles/ceilometer/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/ceilometer/tasks/reconfigure.yml +++ b/ansible/roles/ceilometer/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/ceilometer/tasks/upgrade.yml b/ansible/roles/ceilometer/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/ceilometer/tasks/upgrade.yml +++ b/ansible/roles/ceilometer/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ceph/tasks/bootstrap_mons.yml b/ansible/roles/ceph/tasks/bootstrap_mons.yml index 8d3b0ff577..1baf6b3fce 100644 --- a/ansible/roles/ceph/tasks/bootstrap_mons.yml +++ b/ansible/roles/ceph/tasks/bootstrap_mons.yml @@ -35,5 +35,5 @@ check_mode: no run_once: True -- include: generate_cluster.yml +- include_tasks: generate_cluster.yml when: delegate_host == 'None' and inventory_hostname == groups['ceph-mon'][0] diff --git a/ansible/roles/ceph/tasks/deploy.yml b/ansible/roles/ceph/tasks/deploy.yml index de8f8e3e61..cddd4171c4 100644 --- a/ansible/roles/ceph/tasks/deploy.yml +++ b/ansible/roles/ceph/tasks/deploy.yml @@ -1,23 +1,23 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_mons.yml +- include_tasks: bootstrap_mons.yml when: inventory_hostname in groups['ceph-mon'] -- include: distribute_keyrings.yml +- include_tasks: distribute_keyrings.yml -- include: start_mons.yml +- include_tasks: start_mons.yml when: inventory_hostname in groups['ceph-mon'] -- include: start_mgrs.yml +- include_tasks: start_mgrs.yml when: inventory_hostname in groups['ceph-mgr'] -- include: start_ceph_dashboard.yml +- include_tasks: start_ceph_dashboard.yml when: - enable_ceph_dashboard | bool - inventory_hostname in groups['ceph-mon'] -- include: start_nfss.yml +- include_tasks: start_nfss.yml when: - enable_ceph_nfs | bool - inventory_hostname in groups['ceph-nfs'] @@ -29,23 +29,23 @@ run_once: True delegate_to: "{{ groups['ceph-mon'][0] }}" -- include: bootstrap_osds.yml +- include_tasks: bootstrap_osds.yml when: inventory_hostname in groups['ceph-osd'] -- include: start_osds.yml +- include_tasks: start_osds.yml when: inventory_hostname in groups['ceph-osd'] -- include: start_rgws.yml +- include_tasks: start_rgws.yml when: - enable_ceph_rgw | bool - inventory_hostname in groups['ceph-rgw'] -- include: start_rgw_keystone.yml +- include_tasks: start_rgw_keystone.yml when: - enable_ceph_rgw_keystone | bool - inventory_hostname in groups['ceph-rgw'] -- include: start_mdss.yml +- include_tasks: start_mdss.yml when: - enable_ceph_mds | bool - inventory_hostname in groups['ceph-mds'] diff --git a/ansible/roles/ceph/tasks/generate_cluster.yml b/ansible/roles/ceph/tasks/generate_cluster.yml index bf50c721cd..121e36aaa4 100644 --- a/ansible/roles/ceph/tasks/generate_cluster.yml +++ b/ansible/roles/ceph/tasks/generate_cluster.yml @@ -22,7 +22,7 @@ - "ceph_mon_config:/etc/ceph" - "kolla_logs:/var/log/kolla/" -- include: start_mons.yml +- include_tasks: start_mons.yml - name: Setting host for cluster files set_fact: diff --git a/ansible/roles/ceph/tasks/main.yml b/ansible/roles/ceph/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/ceph/tasks/main.yml +++ b/ansible/roles/ceph/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ceph/tasks/reconfigure.yml b/ansible/roles/ceph/tasks/reconfigure.yml index c750ea8b89..9e4ca35574 100644 --- a/ansible/roles/ceph/tasks/reconfigure.yml +++ b/ansible/roles/ceph/tasks/reconfigure.yml @@ -55,7 +55,7 @@ with_items: - { name: ceph_rgw, group: ceph-rgw } -- include: config.yml +- include_tasks: config.yml - name: Check the configs in ceph_mon container command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check @@ -165,17 +165,17 @@ - "{{ ceph_rgw_container_envs.results }}" - "{{ ceph_rgw_check_results.results }}" -- include: start_mons.yml +- include_tasks: start_mons.yml when: - inventory_hostname in groups['ceph-mon'] - remove_ceph_mon_container.changed -- include: start_osds.yml +- include_tasks: start_osds.yml when: - inventory_hostname in groups['ceph-osd'] - remove_ceph_osd_containers.changed -- include: start_rgws.yml +- include_tasks: start_rgws.yml when: - inventory_hostname in groups['ceph-rgw'] - remove_ceph_rgw_container.changed diff --git a/ansible/roles/ceph/tasks/start_mdss.yml b/ansible/roles/ceph/tasks/start_mdss.yml index 1d03ffc38b..fdce017bf5 100644 --- a/ansible/roles/ceph/tasks/start_mdss.yml +++ b/ansible/roles/ceph/tasks/start_mdss.yml @@ -1,5 +1,5 @@ --- -- include: ../../ceph_pools.yml +- include_tasks: ../../ceph_pools.yml vars: pool_name: "{{ item.pool_name }}" pool_type: "{{ item.pool_type }}" diff --git a/ansible/roles/ceph/tasks/upgrade.yml b/ansible/roles/ceph/tasks/upgrade.yml index 3e5ed3fa65..89449a0de5 100644 --- a/ansible/roles/ceph/tasks/upgrade.yml +++ b/ansible/roles/ceph/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml # NOTE(jeffrey4l): client.admin caps should be update when upgrade from Jewel # to Luminous @@ -10,26 +10,26 @@ run_once: True delegate_to: "{{ groups['ceph-mon'][0] }}" -- include: start_mons.yml +- include_tasks: start_mons.yml when: inventory_hostname in groups['ceph-mon'] -- include: start_mgrs.yml +- include_tasks: start_mgrs.yml when: inventory_hostname in groups['ceph-mgr'] -- include: start_osds.yml +- include_tasks: start_osds.yml when: inventory_hostname in groups['ceph-osd'] -- include: start_rgws.yml +- include_tasks: start_rgws.yml when: - enable_ceph_rgw | bool - inventory_hostname in groups['ceph-rgw'] -- include: start_mdss.yml +- include_tasks: start_mdss.yml when: - enable_ceph_mds | bool - inventory_hostname in groups['ceph-mds'] -- include: start_nfss.yml +- include_tasks: start_nfss.yml when: - enable_ceph_nfs | bool - inventory_hostname in groups['ceph-nfs'] diff --git a/ansible/roles/certificates/tasks/main.yml b/ansible/roles/certificates/tasks/main.yml index 2403646bcf..23e2751e67 100644 --- a/ansible/roles/certificates/tasks/main.yml +++ b/ansible/roles/certificates/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: generate.yml +- include_tasks: generate.yml diff --git a/ansible/roles/chrony/tasks/deploy.yml b/ansible/roles/chrony/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/chrony/tasks/deploy.yml +++ b/ansible/roles/chrony/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/chrony/tasks/main.yml b/ansible/roles/chrony/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/chrony/tasks/main.yml +++ b/ansible/roles/chrony/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/chrony/tasks/reconfigure.yml b/ansible/roles/chrony/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/chrony/tasks/reconfigure.yml +++ b/ansible/roles/chrony/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/chrony/tasks/upgrade.yml b/ansible/roles/chrony/tasks/upgrade.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/chrony/tasks/upgrade.yml +++ b/ansible/roles/chrony/tasks/upgrade.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml index 59f2a0ec15..d68e9f148a 100644 --- a/ansible/roles/cinder/tasks/bootstrap.yml +++ b/ansible/roles/cinder/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/cinder/tasks/ceph.yml b/ansible/roles/cinder/tasks/ceph.yml index 71599a62b6..952ebeddcf 100644 --- a/ansible/roles/cinder/tasks/ceph.yml +++ b/ansible/roles/cinder/tasks/ceph.yml @@ -36,7 +36,7 @@ - item.key in services_need_config with_dict: "{{ cinder_services }}" -- include: ../../ceph_pools.yml +- include_tasks: ../../ceph_pools.yml vars: pool_name: "{{ cinder_pool_name }}" pool_type: "{{ cinder_pool_type }}" @@ -45,7 +45,7 @@ pool_pgp_num: "{{ cinder_pool_pgp_num }}" pool_application: "rbd" -- include: ../../ceph_pools.yml +- include_tasks: ../../ceph_pools.yml vars: pool_name: "{{ cinder_backup_pool_name }}" pool_type: "{{ cinder_backup_pool_type }}" diff --git a/ansible/roles/cinder/tasks/deploy.yml b/ansible/roles/cinder/tasks/deploy.yml index f34e908ba2..9a5765f17e 100644 --- a/ansible/roles/cinder/tasks/deploy.yml +++ b/ansible/roles/cinder/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: ceph.yml +- include_tasks: ceph.yml when: - (enable_ceph | bool) and (cinder_backend_ceph | bool) - inventory_hostname in groups['ceph-mon'] or @@ -8,31 +8,31 @@ inventory_hostname in groups['cinder-scheduler'] or inventory_hostname in groups['cinder-backup'] -- include: external_ceph.yml +- include_tasks: external_ceph.yml when: - (enable_ceph | bool == False) and (cinder_backend_ceph | bool) - inventory_hostname in groups['cinder-volume'] or inventory_hostname in groups['cinder-backup'] -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['cinder-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['cinder-api'] or inventory_hostname in groups['cinder-volume'] or inventory_hostname in groups['cinder-scheduler'] or inventory_hostname in groups['cinder-backup'] -- include: clone.yml +- include_tasks: clone.yml when: cinder_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['cinder-api'] - name: Flush handlers meta: flush_handlers -- include: check.yml +- include_tasks: check.yml when: inventory_hostname in groups['cinder-api'] or inventory_hostname in groups['cinder-volume'] or inventory_hostname in groups['cinder-scheduler'] or diff --git a/ansible/roles/cinder/tasks/main.yml b/ansible/roles/cinder/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/cinder/tasks/main.yml +++ b/ansible/roles/cinder/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/cinder/tasks/reconfigure.yml b/ansible/roles/cinder/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/cinder/tasks/reconfigure.yml +++ b/ansible/roles/cinder/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml index 297f2728ed..248becb95f 100644 --- a/ansible/roles/cinder/tasks/upgrade.yml +++ b/ansible/roles/cinder/tasks/upgrade.yml @@ -1,17 +1,17 @@ --- # NOTE (duonghq): I break pull and config into 2 phases to prevent new version # of service start if node or process in node crash accidentally. -- include: pull.yml +- include_tasks: pull.yml when: inventory_hostname == groups["cinder-api"][0] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname == groups["cinder-api"][0] -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml -- include: pull.yml +- include_tasks: pull.yml -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cloudkitty/tasks/bootstrap.yml b/ansible/roles/cloudkitty/tasks/bootstrap.yml index 14aeeeceb4..e96a568454 100644 --- a/ansible/roles/cloudkitty/tasks/bootstrap.yml +++ b/ansible/roles/cloudkitty/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/cloudkitty/tasks/deploy.yml b/ansible/roles/cloudkitty/tasks/deploy.yml index aae4a8a4d9..32fa68ed29 100644 --- a/ansible/roles/cloudkitty/tasks/deploy.yml +++ b/ansible/roles/cloudkitty/tasks/deploy.yml @@ -1,15 +1,15 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['cloudkitty-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['cloudkitty-api'] or inventory_hostname in groups['cloudkitty-processor'] -- include: clone.yml +- include_tasks: clone.yml when: cloudkitty_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['cloudkitty-api'] - name: Flush handlers diff --git a/ansible/roles/cloudkitty/tasks/main.yml b/ansible/roles/cloudkitty/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/cloudkitty/tasks/main.yml +++ b/ansible/roles/cloudkitty/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/cloudkitty/tasks/reconfigure.yml b/ansible/roles/cloudkitty/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/cloudkitty/tasks/reconfigure.yml +++ b/ansible/roles/cloudkitty/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/cloudkitty/tasks/upgrade.yml b/ansible/roles/cloudkitty/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/cloudkitty/tasks/upgrade.yml +++ b/ansible/roles/cloudkitty/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/collectd/tasks/deploy.yml b/ansible/roles/collectd/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/collectd/tasks/deploy.yml +++ b/ansible/roles/collectd/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/collectd/tasks/main.yml b/ansible/roles/collectd/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/collectd/tasks/main.yml +++ b/ansible/roles/collectd/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/collectd/tasks/reconfigure.yml b/ansible/roles/collectd/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/collectd/tasks/reconfigure.yml +++ b/ansible/roles/collectd/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/collectd/tasks/upgrade.yml b/ansible/roles/collectd/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/collectd/tasks/upgrade.yml +++ b/ansible/roles/collectd/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/common/tasks/deploy.yml b/ansible/roles/common/tasks/deploy.yml index 9eca42dec5..6f6feecec0 100644 --- a/ansible/roles/common/tasks/deploy.yml +++ b/ansible/roles/common/tasks/deploy.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index 0b4b423c16..a314ca5a4a 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,5 +1,5 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" tags: common when: not common_run diff --git a/ansible/roles/common/tasks/reconfigure.yml b/ansible/roles/common/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/common/tasks/reconfigure.yml +++ b/ansible/roles/common/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/common/tasks/upgrade.yml b/ansible/roles/common/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/common/tasks/upgrade.yml +++ b/ansible/roles/common/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/congress/tasks/bootstrap.yml b/ansible/roles/congress/tasks/bootstrap.yml index 90de9d8ece..a3a0c5c62b 100644 --- a/ansible/roles/congress/tasks/bootstrap.yml +++ b/ansible/roles/congress/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/congress/tasks/deploy.yml b/ansible/roles/congress/tasks/deploy.yml index e7b57aca8f..b1fa5dd1a5 100644 --- a/ansible/roles/congress/tasks/deploy.yml +++ b/ansible/roles/congress/tasks/deploy.yml @@ -1,16 +1,16 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['congress-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['congress-api'] or inventory_hostname in groups['congress-policy-engine'] or inventory_hostname in groups['congress-datasource'] -- include: clone.yml +- include_tasks: clone.yml when: congress_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['congress-api'] - name: Flush handlers diff --git a/ansible/roles/congress/tasks/main.yml b/ansible/roles/congress/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/congress/tasks/main.yml +++ b/ansible/roles/congress/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/congress/tasks/reconfigure.yml b/ansible/roles/congress/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/congress/tasks/reconfigure.yml +++ b/ansible/roles/congress/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/congress/tasks/upgrade.yml b/ansible/roles/congress/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/congress/tasks/upgrade.yml +++ b/ansible/roles/congress/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/designate/tasks/bootstrap.yml b/ansible/roles/designate/tasks/bootstrap.yml index ec69c45d72..e7f0122c4a 100644 --- a/ansible/roles/designate/tasks/bootstrap.yml +++ b/ansible/roles/designate/tasks/bootstrap.yml @@ -42,5 +42,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/designate/tasks/config.yml b/ansible/roles/designate/tasks/config.yml index 3f4be6b6f9..d4dbf488ac 100644 --- a/ansible/roles/designate/tasks/config.yml +++ b/ansible/roles/designate/tasks/config.yml @@ -148,7 +148,7 @@ - Restart designate-backend-bind9 container - Restart designate-worker container -- include: backend_external.yml +- include_tasks: backend_external.yml when: designate_backend_external == 'bind9' - name: Check if policies shall be overwritten diff --git a/ansible/roles/designate/tasks/deploy.yml b/ansible/roles/designate/tasks/deploy.yml index 0d05569d86..373af0ea4c 100644 --- a/ansible/roles/designate/tasks/deploy.yml +++ b/ansible/roles/designate/tasks/deploy.yml @@ -1,8 +1,8 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['designate-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['designate-api'] or inventory_hostname in groups['designate-central'] or inventory_hostname in groups['designate-producer'] or @@ -11,14 +11,14 @@ inventory_hostname in groups['designate-sink'] or inventory_hostname in groups['designate-backend-bind9'] -- include: clone.yml +- include_tasks: clone.yml when: designate_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['designate-central'] - name: Flush handlers meta: flush_handlers -- include: update_pools.yml +- include_tasks: update_pools.yml when: inventory_hostname in groups['designate-worker'][0] diff --git a/ansible/roles/designate/tasks/main.yml b/ansible/roles/designate/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/designate/tasks/main.yml +++ b/ansible/roles/designate/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/designate/tasks/reconfigure.yml b/ansible/roles/designate/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/designate/tasks/reconfigure.yml +++ b/ansible/roles/designate/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/designate/tasks/upgrade.yml b/ansible/roles/designate/tasks/upgrade.yml index 02ddbc03e6..df17b506bd 100644 --- a/ansible/roles/designate/tasks/upgrade.yml +++ b/ansible/roles/designate/tasks/upgrade.yml @@ -1,9 +1,9 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers -- include: update_pools.yml +- include_tasks: update_pools.yml diff --git a/ansible/roles/destroy/tasks/main.yml b/ansible/roles/destroy/tasks/main.yml index 33c0113649..f32bc9919a 100644 --- a/ansible/roles/destroy/tasks/main.yml +++ b/ansible/roles/destroy/tasks/main.yml @@ -1,8 +1,8 @@ --- -- include: validate_docker_execute.yml +- include_tasks: validate_docker_execute.yml -- include: cleanup_containers.yml +- include_tasks: cleanup_containers.yml -- include: cleanup_images.yml +- include_tasks: cleanup_images.yml -- include: cleanup_host.yml +- include_tasks: cleanup_host.yml diff --git a/ansible/roles/elasticsearch/tasks/deploy.yml b/ansible/roles/elasticsearch/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/elasticsearch/tasks/deploy.yml +++ b/ansible/roles/elasticsearch/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/elasticsearch/tasks/main.yml b/ansible/roles/elasticsearch/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/elasticsearch/tasks/main.yml +++ b/ansible/roles/elasticsearch/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/elasticsearch/tasks/reconfigure.yml b/ansible/roles/elasticsearch/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/elasticsearch/tasks/reconfigure.yml +++ b/ansible/roles/elasticsearch/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/elasticsearch/tasks/upgrade.yml b/ansible/roles/elasticsearch/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/elasticsearch/tasks/upgrade.yml +++ b/ansible/roles/elasticsearch/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/etcd/tasks/deploy.yml b/ansible/roles/etcd/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/etcd/tasks/deploy.yml +++ b/ansible/roles/etcd/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/etcd/tasks/main.yml b/ansible/roles/etcd/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/etcd/tasks/main.yml +++ b/ansible/roles/etcd/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/etcd/tasks/reconfigure.yml b/ansible/roles/etcd/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/etcd/tasks/reconfigure.yml +++ b/ansible/roles/etcd/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/etcd/tasks/upgrade.yml b/ansible/roles/etcd/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/etcd/tasks/upgrade.yml +++ b/ansible/roles/etcd/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/freezer/tasks/deploy.yml b/ansible/roles/freezer/tasks/deploy.yml index c49c38a8f0..8fb607c92e 100644 --- a/ansible/roles/freezer/tasks/deploy.yml +++ b/ansible/roles/freezer/tasks/deploy.yml @@ -1,12 +1,12 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['freezer-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['freezer-api'] or inventory_hostname in groups['freezer-scheduler'] -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: inventory_hostname in groups['freezer-api'] - name: Flush handlers diff --git a/ansible/roles/freezer/tasks/main.yml b/ansible/roles/freezer/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/freezer/tasks/main.yml +++ b/ansible/roles/freezer/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/freezer/tasks/reconfigure.yml b/ansible/roles/freezer/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/freezer/tasks/reconfigure.yml +++ b/ansible/roles/freezer/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/freezer/tasks/upgrade.yml b/ansible/roles/freezer/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/freezer/tasks/upgrade.yml +++ b/ansible/roles/freezer/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml index 2ec00fc28e..e1f6244ba9 100644 --- a/ansible/roles/glance/tasks/bootstrap.yml +++ b/ansible/roles/glance/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/glance/tasks/ceph.yml b/ansible/roles/glance/tasks/ceph.yml index 0055f19425..614069c545 100644 --- a/ansible/roles/glance/tasks/ceph.yml +++ b/ansible/roles/glance/tasks/ceph.yml @@ -16,7 +16,7 @@ mode: "0660" when: inventory_hostname in groups['glance-api'] -- include: ../../ceph_pools.yml +- include_tasks: ../../ceph_pools.yml vars: pool_name: "{{ glance_pool_name }}" pool_type: "{{ glance_pool_type }}" diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index 46452f394c..dc4e8bb59b 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -1,10 +1,10 @@ --- -- include: ceph.yml +- include_tasks: ceph.yml when: - enable_ceph | bool - glance_backend_ceph | bool -- include: external_ceph.yml +- include_tasks: external_ceph.yml when: - enable_ceph | bool == False - glance_backend_ceph | bool diff --git a/ansible/roles/glance/tasks/deploy.yml b/ansible/roles/glance/tasks/deploy.yml index a27897d84a..fc2c667e49 100644 --- a/ansible/roles/glance/tasks/deploy.yml +++ b/ansible/roles/glance/tasks/deploy.yml @@ -1,21 +1,21 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['glance-api'] -- include: config.yml +- include_tasks: config.yml -- include: clone.yml +- include_tasks: clone.yml when: - glance_dev_mode | bool - inventory_hostname in groups['glance-api'] or inventory_hostname in groups['glance-registry'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['glance-api'] - name: Flush handlers meta: flush_handlers -- include: check.yml +- include_tasks: check.yml when: inventory_hostname in groups['glance-api'] or inventory_hostname in groups['glance-registry'] diff --git a/ansible/roles/glance/tasks/legacy_upgrade.yml b/ansible/roles/glance/tasks/legacy_upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/glance/tasks/legacy_upgrade.yml +++ b/ansible/roles/glance/tasks/legacy_upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/glance/tasks/main.yml b/ansible/roles/glance/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/glance/tasks/main.yml +++ b/ansible/roles/glance/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/glance/tasks/reconfigure.yml b/ansible/roles/glance/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/glance/tasks/reconfigure.yml +++ b/ansible/roles/glance/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/glance/tasks/rolling_upgrade.yml b/ansible/roles/glance/tasks/rolling_upgrade.yml index 26de521d7b..fdf806187b 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/ansible/roles/glance/tasks/rolling_upgrade.yml @@ -3,13 +3,13 @@ glance_upgrading: True # Upgrade first node (NEW NODE in the Glance documentation) -- include: pull.yml +- include_tasks: pull.yml when: inventory_hostname == groups["glance-api"][0] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname == groups["glance-api"][0] -- include: stop_service.yml +- include_tasks: stop_service.yml when: inventory_hostname == groups["glance-api"][0] - name: Enable log_bin_trust_function_creators function @@ -74,10 +74,10 @@ - Restart glance-api container # Upgrade remaining node -- include: pull.yml +- include_tasks: pull.yml when: inventory_hostname != groups["glance-api"][0] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname != groups["glance-api"][0] - name: Flush handlers diff --git a/ansible/roles/glance/tasks/upgrade.yml b/ansible/roles/glance/tasks/upgrade.yml index e04a384462..94f2eff68d 100644 --- a/ansible/roles/glance/tasks/upgrade.yml +++ b/ansible/roles/glance/tasks/upgrade.yml @@ -1,6 +1,6 @@ --- -- include: rolling_upgrade.yml +- include_tasks: rolling_upgrade.yml when: glance_enable_rolling_upgrade | bool -- include: legacy_upgrade.yml +- include_tasks: legacy_upgrade.yml when: not glance_enable_rolling_upgrade | bool diff --git a/ansible/roles/gnocchi/tasks/bootstrap.yml b/ansible/roles/gnocchi/tasks/bootstrap.yml index e8292f56e4..ec33bac7c5 100644 --- a/ansible/roles/gnocchi/tasks/bootstrap.yml +++ b/ansible/roles/gnocchi/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/gnocchi/tasks/ceph.yml b/ansible/roles/gnocchi/tasks/ceph.yml index e39537b3ae..3ae3aee140 100644 --- a/ansible/roles/gnocchi/tasks/ceph.yml +++ b/ansible/roles/gnocchi/tasks/ceph.yml @@ -22,7 +22,7 @@ - "gnocchi-metricd" - "gnocchi-statsd" -- include: ../../ceph_pools.yml +- include_tasks: ../../ceph_pools.yml vars: pool_name: "{{ gnocchi_pool_name }}" pool_type: "{{ gnocchi_pool_type }}" diff --git a/ansible/roles/gnocchi/tasks/deploy.yml b/ansible/roles/gnocchi/tasks/deploy.yml index 18de8752ee..e80952cb85 100644 --- a/ansible/roles/gnocchi/tasks/deploy.yml +++ b/ansible/roles/gnocchi/tasks/deploy.yml @@ -1,23 +1,23 @@ --- -- include: ceph.yml +- include_tasks: ceph.yml when: - enable_ceph | bool - gnocchi_backend_storage == 'ceph' -- include: external_ceph.yml +- include_tasks: external_ceph.yml when: - enable_ceph | bool == False - gnocchi_backend_storage == 'ceph' -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['gnocchi-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['gnocchi-statsd'] or inventory_hostname in groups['gnocchi-api'] or inventory_hostname in groups['gnocchi-metricd'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['gnocchi-api'] - name: Flush handlers diff --git a/ansible/roles/gnocchi/tasks/main.yml b/ansible/roles/gnocchi/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/gnocchi/tasks/main.yml +++ b/ansible/roles/gnocchi/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/gnocchi/tasks/reconfigure.yml b/ansible/roles/gnocchi/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/gnocchi/tasks/reconfigure.yml +++ b/ansible/roles/gnocchi/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/gnocchi/tasks/upgrade.yml b/ansible/roles/gnocchi/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/gnocchi/tasks/upgrade.yml +++ b/ansible/roles/gnocchi/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/grafana/tasks/deploy.yml b/ansible/roles/grafana/tasks/deploy.yml index 8dee54b5a9..2c545ecbc9 100644 --- a/ansible/roles/grafana/tasks/deploy.yml +++ b/ansible/roles/grafana/tasks/deploy.yml @@ -1,9 +1,9 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers -- include: post_config.yml +- include_tasks: post_config.yml diff --git a/ansible/roles/grafana/tasks/main.yml b/ansible/roles/grafana/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/grafana/tasks/main.yml +++ b/ansible/roles/grafana/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/grafana/tasks/reconfigure.yml b/ansible/roles/grafana/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/grafana/tasks/reconfigure.yml +++ b/ansible/roles/grafana/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/grafana/tasks/upgrade.yml b/ansible/roles/grafana/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/grafana/tasks/upgrade.yml +++ b/ansible/roles/grafana/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/haproxy/tasks/deploy.yml b/ansible/roles/haproxy/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/haproxy/tasks/deploy.yml +++ b/ansible/roles/haproxy/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/haproxy/tasks/main.yml b/ansible/roles/haproxy/tasks/main.yml index 91a951d595..94b59449f8 100644 --- a/ansible/roles/haproxy/tasks/main.yml +++ b/ansible/roles/haproxy/tasks/main.yml @@ -1,3 +1,3 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" when: inventory_hostname in groups['haproxy'] diff --git a/ansible/roles/haproxy/tasks/reconfigure.yml b/ansible/roles/haproxy/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/haproxy/tasks/reconfigure.yml +++ b/ansible/roles/haproxy/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/haproxy/tasks/upgrade.yml b/ansible/roles/haproxy/tasks/upgrade.yml index 3affae9e38..0a452d2d55 100644 --- a/ansible/roles/haproxy/tasks/upgrade.yml +++ b/ansible/roles/haproxy/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - set_fact: secondary_addresses={{ hostvars[inventory_hostname]['ansible_' + api_interface].get('ipv4_secondaries', []) | map(attribute='address') | list }} diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml index f47b4305e0..7fe1b95524 100644 --- a/ansible/roles/heat/tasks/bootstrap.yml +++ b/ansible/roles/heat/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/heat/tasks/deploy.yml b/ansible/roles/heat/tasks/deploy.yml index c7df48d3a2..d877d83616 100644 --- a/ansible/roles/heat/tasks/deploy.yml +++ b/ansible/roles/heat/tasks/deploy.yml @@ -1,20 +1,20 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['heat-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['heat-api'] or inventory_hostname in groups['heat-api-cfn'] or inventory_hostname in groups['heat-engine'] -- include: clone.yml +- include_tasks: clone.yml when: - heat_dev_mode | bool - inventory_hostname in groups['heat-api'] or inventory_hostname in groups['heat-api-cfn'] or inventory_hostname in groups['heat-engine'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['heat-api'] - name: Flush handlers diff --git a/ansible/roles/heat/tasks/main.yml b/ansible/roles/heat/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/heat/tasks/main.yml +++ b/ansible/roles/heat/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/heat/tasks/reconfigure.yml b/ansible/roles/heat/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/heat/tasks/reconfigure.yml +++ b/ansible/roles/heat/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/heat/tasks/upgrade.yml b/ansible/roles/heat/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/heat/tasks/upgrade.yml +++ b/ansible/roles/heat/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/horizon/tasks/bootstrap.yml b/ansible/roles/horizon/tasks/bootstrap.yml index 5de5496ec2..dfd0ece1cb 100644 --- a/ansible/roles/horizon/tasks/bootstrap.yml +++ b/ansible/roles/horizon/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml index fc959e92a0..28ecd27d21 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -15,7 +15,7 @@ - set_fact: custom_policy: [] -- include: policy_item.yml +- include_tasks: policy_item.yml vars: project_name: "{{ item.name }}" when: item.enabled | bool diff --git a/ansible/roles/horizon/tasks/deploy.yml b/ansible/roles/horizon/tasks/deploy.yml index 16acf06efd..03ce156989 100644 --- a/ansible/roles/horizon/tasks/deploy.yml +++ b/ansible/roles/horizon/tasks/deploy.yml @@ -1,11 +1,11 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: clone.yml +- include_tasks: clone.yml when: - horizon_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: horizon_backend_database | bool - name: Flush handlers diff --git a/ansible/roles/horizon/tasks/main.yml b/ansible/roles/horizon/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/horizon/tasks/main.yml +++ b/ansible/roles/horizon/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/horizon/tasks/reconfigure.yml b/ansible/roles/horizon/tasks/reconfigure.yml index 56169f9727..a5d205a835 100644 --- a/ansible/roles/horizon/tasks/reconfigure.yml +++ b/ansible/roles/horizon/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: "deploy.yml" +- include_tasks: "deploy.yml" diff --git a/ansible/roles/horizon/tasks/upgrade.yml b/ansible/roles/horizon/tasks/upgrade.yml index a23792f0c8..8aafca5d29 100644 --- a/ansible/roles/horizon/tasks/upgrade.yml +++ b/ansible/roles/horizon/tasks/upgrade.yml @@ -1,11 +1,11 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: clone.yml +- include_tasks: clone.yml when: - horizon_dev_mode | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: horizon_backend_database | bool - name: Flush handlers diff --git a/ansible/roles/influxdb/tasks/deploy.yml b/ansible/roles/influxdb/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/influxdb/tasks/deploy.yml +++ b/ansible/roles/influxdb/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/influxdb/tasks/main.yml b/ansible/roles/influxdb/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/influxdb/tasks/main.yml +++ b/ansible/roles/influxdb/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/influxdb/tasks/reconfigure.yml b/ansible/roles/influxdb/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/influxdb/tasks/reconfigure.yml +++ b/ansible/roles/influxdb/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/influxdb/tasks/upgrade.yml b/ansible/roles/influxdb/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/influxdb/tasks/upgrade.yml +++ b/ansible/roles/influxdb/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml index 6cc331680f..0763380b4b 100644 --- a/ansible/roles/ironic/tasks/bootstrap.yml +++ b/ansible/roles/ironic/tasks/bootstrap.yml @@ -48,7 +48,7 @@ - not use_preconfigured_databases | bool - inventory_hostname in groups[item.group] -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed - name: Running Ironic-PXE bootstrap container diff --git a/ansible/roles/ironic/tasks/deploy.yml b/ansible/roles/ironic/tasks/deploy.yml index 898363357a..0d80b23c11 100644 --- a/ansible/roles/ironic/tasks/deploy.yml +++ b/ansible/roles/ironic/tasks/deploy.yml @@ -1,20 +1,20 @@ --- -- include: register.yml +- include_tasks: register.yml when: enable_keystone | bool and (inventory_hostname in groups['ironic-api'] or inventory_hostname in groups['ironic-inspector']) -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['ironic-api'] or inventory_hostname in groups['ironic-conductor'] or inventory_hostname in groups['ironic-inspector'] or inventory_hostname in groups['ironic-pxe'] or inventory_hostname in groups['ironic-ipxe'] -- include: clone.yml +- include_tasks: clone.yml when: ironic_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['ironic-api'] or inventory_hostname in groups['ironic-inspector'] or inventory_hostname in groups['ironic-pxe'] diff --git a/ansible/roles/ironic/tasks/legacy_upgrade.yml b/ansible/roles/ironic/tasks/legacy_upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/ironic/tasks/legacy_upgrade.yml +++ b/ansible/roles/ironic/tasks/legacy_upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ironic/tasks/main.yml b/ansible/roles/ironic/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/ironic/tasks/main.yml +++ b/ansible/roles/ironic/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ironic/tasks/reconfigure.yml b/ansible/roles/ironic/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/ironic/tasks/reconfigure.yml +++ b/ansible/roles/ironic/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/ironic/tasks/rolling_upgrade.yml b/ansible/roles/ironic/tasks/rolling_upgrade.yml index f77d6060d8..d17b12b4f5 100644 --- a/ansible/roles/ironic/tasks/rolling_upgrade.yml +++ b/ansible/roles/ironic/tasks/rolling_upgrade.yml @@ -1,12 +1,12 @@ --- -- include: pull.yml +- include_tasks: pull.yml # Pin release version -- include: config.yml +- include_tasks: config.yml vars: pin_release_version: "{{ openstack_previous_release_name }}" -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml # TODO(donghm): Flush_handlers to restart ironic services # should be run in serial nodes to decrease downtime. Update when @@ -17,7 +17,7 @@ meta: flush_handlers # Unpin version -- include: config.yml +- include_tasks: config.yml # Restart ironic services with unpinned release version - name: Flush handlers diff --git a/ansible/roles/ironic/tasks/upgrade.yml b/ansible/roles/ironic/tasks/upgrade.yml index 3533e93670..89541a74af 100644 --- a/ansible/roles/ironic/tasks/upgrade.yml +++ b/ansible/roles/ironic/tasks/upgrade.yml @@ -1,6 +1,6 @@ --- -- include: rolling_upgrade.yml +- include_tasks: rolling_upgrade.yml when: ironic_enable_rolling_upgrade | bool -- include: legacy_upgrade.yml +- include_tasks: legacy_upgrade.yml when: not ironic_enable_rolling_upgrade | bool diff --git a/ansible/roles/iscsi/tasks/deploy.yml b/ansible/roles/iscsi/tasks/deploy.yml index 1f16915ad9..fae82a1da6 100644 --- a/ansible/roles/iscsi/tasks/deploy.yml +++ b/ansible/roles/iscsi/tasks/deploy.yml @@ -1,4 +1,4 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: start.yml +- include_tasks: start.yml diff --git a/ansible/roles/iscsi/tasks/main.yml b/ansible/roles/iscsi/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/iscsi/tasks/main.yml +++ b/ansible/roles/iscsi/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/iscsi/tasks/upgrade.yml b/ansible/roles/iscsi/tasks/upgrade.yml index 1f16915ad9..fae82a1da6 100644 --- a/ansible/roles/iscsi/tasks/upgrade.yml +++ b/ansible/roles/iscsi/tasks/upgrade.yml @@ -1,4 +1,4 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: start.yml +- include_tasks: start.yml diff --git a/ansible/roles/kafka/tasks/deploy.yml b/ansible/roles/kafka/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/kafka/tasks/deploy.yml +++ b/ansible/roles/kafka/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/kafka/tasks/main.yml b/ansible/roles/kafka/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/kafka/tasks/main.yml +++ b/ansible/roles/kafka/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/kafka/tasks/reconfigure.yml b/ansible/roles/kafka/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/kafka/tasks/reconfigure.yml +++ b/ansible/roles/kafka/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/kafka/tasks/upgrade.yml b/ansible/roles/kafka/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/kafka/tasks/upgrade.yml +++ b/ansible/roles/kafka/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/karbor/tasks/bootstrap.yml b/ansible/roles/karbor/tasks/bootstrap.yml index f770733746..58e67b7d79 100644 --- a/ansible/roles/karbor/tasks/bootstrap.yml +++ b/ansible/roles/karbor/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/karbor/tasks/deploy.yml b/ansible/roles/karbor/tasks/deploy.yml index 17fc56ea48..5935feb924 100644 --- a/ansible/roles/karbor/tasks/deploy.yml +++ b/ansible/roles/karbor/tasks/deploy.yml @@ -1,13 +1,13 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['karbor-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['karbor-api'] or inventory_hostname in groups['karbor-protection'] or inventory_hostname in groups['karbor-operationengine'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['karbor-api'] - name: Flush handlers diff --git a/ansible/roles/karbor/tasks/main.yml b/ansible/roles/karbor/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/karbor/tasks/main.yml +++ b/ansible/roles/karbor/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/karbor/tasks/reconfigure.yml b/ansible/roles/karbor/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/karbor/tasks/reconfigure.yml +++ b/ansible/roles/karbor/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/karbor/tasks/upgrade.yml b/ansible/roles/karbor/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/karbor/tasks/upgrade.yml +++ b/ansible/roles/karbor/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml index c4cd3f70c5..093d7966f2 100644 --- a/ansible/roles/keystone/tasks/bootstrap.yml +++ b/ansible/roles/keystone/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/keystone/tasks/deploy.yml b/ansible/roles/keystone/tasks/deploy.yml index 5bb94610eb..cf24dfb30b 100644 --- a/ansible/roles/keystone/tasks/deploy.yml +++ b/ansible/roles/keystone/tasks/deploy.yml @@ -1,19 +1,19 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: clone.yml +- include_tasks: clone.yml when: - keystone_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers -- include: init_fernet.yml +- include_tasks: init_fernet.yml when: - keystone_token_provider == 'fernet' -- include: register.yml +- include_tasks: register.yml -- include: check.yml +- include_tasks: check.yml diff --git a/ansible/roles/keystone/tasks/main.yml b/ansible/roles/keystone/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/keystone/tasks/main.yml +++ b/ansible/roles/keystone/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/keystone/tasks/reconfigure.yml b/ansible/roles/keystone/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/keystone/tasks/reconfigure.yml +++ b/ansible/roles/keystone/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml index b20d5792cc..8b2c7c29a2 100644 --- a/ansible/roles/keystone/tasks/upgrade.yml +++ b/ansible/roles/keystone/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Enable log_bin_trust_function_creators function kolla_toolbox: diff --git a/ansible/roles/kibana/tasks/deploy.yml b/ansible/roles/kibana/tasks/deploy.yml index 844a72d0c7..747e7f665d 100644 --- a/ansible/roles/kibana/tasks/deploy.yml +++ b/ansible/roles/kibana/tasks/deploy.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers -- include: post_config.yml +- include_tasks: post_config.yml diff --git a/ansible/roles/kibana/tasks/main.yml b/ansible/roles/kibana/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/kibana/tasks/main.yml +++ b/ansible/roles/kibana/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/kibana/tasks/reconfigure.yml b/ansible/roles/kibana/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/kibana/tasks/reconfigure.yml +++ b/ansible/roles/kibana/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/kibana/tasks/upgrade.yml b/ansible/roles/kibana/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/kibana/tasks/upgrade.yml +++ b/ansible/roles/kibana/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/kuryr/tasks/deploy.yml b/ansible/roles/kuryr/tasks/deploy.yml index b1b0eebace..e2aaa677fd 100644 --- a/ansible/roles/kuryr/tasks/deploy.yml +++ b/ansible/roles/kuryr/tasks/deploy.yml @@ -1,9 +1,9 @@ --- -- include: register.yml +- include_tasks: register.yml -- include: config.yml +- include_tasks: config.yml -- include: clone.yml +- include_tasks: clone.yml when: - kuryr_dev_mode | bool diff --git a/ansible/roles/kuryr/tasks/main.yml b/ansible/roles/kuryr/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/kuryr/tasks/main.yml +++ b/ansible/roles/kuryr/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/kuryr/tasks/reconfigure.yml b/ansible/roles/kuryr/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/kuryr/tasks/reconfigure.yml +++ b/ansible/roles/kuryr/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/kuryr/tasks/upgrade.yml b/ansible/roles/kuryr/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/kuryr/tasks/upgrade.yml +++ b/ansible/roles/kuryr/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml index 7ae82fdf4f..8cd2221bcd 100644 --- a/ansible/roles/magnum/tasks/bootstrap.yml +++ b/ansible/roles/magnum/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/magnum/tasks/deploy.yml b/ansible/roles/magnum/tasks/deploy.yml index 5485c84433..aa3b2e08cd 100644 --- a/ansible/roles/magnum/tasks/deploy.yml +++ b/ansible/roles/magnum/tasks/deploy.yml @@ -1,15 +1,15 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['magnum-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['magnum-api'] or inventory_hostname in groups['magnum-conductor'] -- include: clone.yml +- include_tasks: clone.yml when: magnum_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['magnum-api'] - name: Flush handlers diff --git a/ansible/roles/magnum/tasks/main.yml b/ansible/roles/magnum/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/magnum/tasks/main.yml +++ b/ansible/roles/magnum/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/magnum/tasks/reconfigure.yml b/ansible/roles/magnum/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/magnum/tasks/reconfigure.yml +++ b/ansible/roles/magnum/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/magnum/tasks/upgrade.yml b/ansible/roles/magnum/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/magnum/tasks/upgrade.yml +++ b/ansible/roles/magnum/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/manila/tasks/bootstrap.yml b/ansible/roles/manila/tasks/bootstrap.yml index fb0d3e7452..d55dcce5f6 100644 --- a/ansible/roles/manila/tasks/bootstrap.yml +++ b/ansible/roles/manila/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/manila/tasks/deploy.yml b/ansible/roles/manila/tasks/deploy.yml index 9b52ba0b97..00060bb0ce 100644 --- a/ansible/roles/manila/tasks/deploy.yml +++ b/ansible/roles/manila/tasks/deploy.yml @@ -1,37 +1,37 @@ --- -- include: ceph.yml +- include_tasks: ceph.yml when: - enable_ceph | bool - enable_ceph_mds | bool - (enable_manila_backend_cephfs_native | bool) or (enable_manila_backend_cephfs_nfs | bool) - inventory_hostname in groups['manila-share'] -- include: external_ceph.yml +- include_tasks: external_ceph.yml when: - enable_ceph| bool == False - enable_ceph_mds| bool == False - (enable_manila_backend_cephfs_native | bool) or (enable_manila_backend_cephfs_nfs | bool) - inventory_hostname in groups['manila-share'] -- include: clone.yml +- include_tasks: clone.yml when: manila_dev_mode | bool -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['manila-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['manila-api'] or inventory_hostname in groups['manila-data'] or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['manila-scheduler'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['manila-api'] - name: Flush handlers meta: flush_handlers -- include: fix_cephfs_owner.yml +- include_tasks: fix_cephfs_owner.yml when: - enable_ceph | bool - enable_ceph_mds | bool diff --git a/ansible/roles/manila/tasks/main.yml b/ansible/roles/manila/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/manila/tasks/main.yml +++ b/ansible/roles/manila/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/manila/tasks/reconfigure.yml b/ansible/roles/manila/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/manila/tasks/reconfigure.yml +++ b/ansible/roles/manila/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/manila/tasks/upgrade.yml b/ansible/roles/manila/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/manila/tasks/upgrade.yml +++ b/ansible/roles/manila/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml index 5b6b33f5a5..d2db07fce2 100644 --- a/ansible/roles/mariadb/tasks/bootstrap.yml +++ b/ansible/roles/mariadb/tasks/bootstrap.yml @@ -2,12 +2,12 @@ - set_fact: master_host: "{{ groups['mariadb'][0] }}" -- include: lookup_cluster.yml +- include_tasks: lookup_cluster.yml -- include: bootstrap_cluster.yml +- include_tasks: bootstrap_cluster.yml when: - not has_cluster | bool - inventory_hostname == groups['mariadb'][0] -- include: recover_cluster.yml +- include_tasks: recover_cluster.yml when: mariadb_recover | default(False) diff --git a/ansible/roles/mariadb/tasks/deploy.yml b/ansible/roles/mariadb/tasks/deploy.yml index bc8177dea4..aa3784f392 100644 --- a/ansible/roles/mariadb/tasks/deploy.yml +++ b/ansible/roles/mariadb/tasks/deploy.yml @@ -1,12 +1,12 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers -- include: register.yml +- include_tasks: register.yml # Test haproxy user through VIP -- include: check.yml +- include_tasks: check.yml diff --git a/ansible/roles/mariadb/tasks/main.yml b/ansible/roles/mariadb/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/mariadb/tasks/main.yml +++ b/ansible/roles/mariadb/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/mariadb/tasks/reconfigure.yml b/ansible/roles/mariadb/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/mariadb/tasks/reconfigure.yml +++ b/ansible/roles/mariadb/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/mariadb/tasks/upgrade.yml b/ansible/roles/mariadb/tasks/upgrade.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/mariadb/tasks/upgrade.yml +++ b/ansible/roles/mariadb/tasks/upgrade.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/memcached/tasks/deploy.yml b/ansible/roles/memcached/tasks/deploy.yml index 1317d110c3..89028c0f27 100644 --- a/ansible/roles/memcached/tasks/deploy.yml +++ b/ansible/roles/memcached/tasks/deploy.yml @@ -1,2 +1,2 @@ --- -- include: config.yml +- include_tasks: config.yml diff --git a/ansible/roles/memcached/tasks/main.yml b/ansible/roles/memcached/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/memcached/tasks/main.yml +++ b/ansible/roles/memcached/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/memcached/tasks/reconfigure.yml b/ansible/roles/memcached/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/memcached/tasks/reconfigure.yml +++ b/ansible/roles/memcached/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/memcached/tasks/upgrade.yml b/ansible/roles/memcached/tasks/upgrade.yml index 1317d110c3..89028c0f27 100644 --- a/ansible/roles/memcached/tasks/upgrade.yml +++ b/ansible/roles/memcached/tasks/upgrade.yml @@ -1,2 +1,2 @@ --- -- include: config.yml +- include_tasks: config.yml diff --git a/ansible/roles/mistral/tasks/bootstrap.yml b/ansible/roles/mistral/tasks/bootstrap.yml index a53df2f6b3..43cd92426d 100644 --- a/ansible/roles/mistral/tasks/bootstrap.yml +++ b/ansible/roles/mistral/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/mistral/tasks/deploy.yml b/ansible/roles/mistral/tasks/deploy.yml index 4ca5aa737a..22f74c1a36 100644 --- a/ansible/roles/mistral/tasks/deploy.yml +++ b/ansible/roles/mistral/tasks/deploy.yml @@ -1,16 +1,16 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['mistral-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['mistral-api'] or inventory_hostname in groups['mistral-engine'] or inventory_hostname in groups['mistral-executor'] -- include: clone.yml +- include_tasks: clone.yml when: mistral_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['mistral-api'] - name: Flush handlers diff --git a/ansible/roles/mistral/tasks/main.yml b/ansible/roles/mistral/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/mistral/tasks/main.yml +++ b/ansible/roles/mistral/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/mistral/tasks/reconfigure.yml b/ansible/roles/mistral/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/mistral/tasks/reconfigure.yml +++ b/ansible/roles/mistral/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/mistral/tasks/upgrade.yml b/ansible/roles/mistral/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/mistral/tasks/upgrade.yml +++ b/ansible/roles/mistral/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/monasca/tasks/bootstrap.yml b/ansible/roles/monasca/tasks/bootstrap.yml index b8733b5e04..6a3c3af58b 100644 --- a/ansible/roles/monasca/tasks/bootstrap.yml +++ b/ansible/roles/monasca/tasks/bootstrap.yml @@ -33,7 +33,7 @@ - not use_preconfigured_databases | bool - database.changed -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool - name: Creating monasca influxdb database diff --git a/ansible/roles/monasca/tasks/deploy.yml b/ansible/roles/monasca/tasks/deploy.yml index d470d08cfa..15dbbbdecc 100644 --- a/ansible/roles/monasca/tasks/deploy.yml +++ b/ansible/roles/monasca/tasks/deploy.yml @@ -1,21 +1,21 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['monasca-api'] or inventory_hostname in groups['monasca-log-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['monasca-api'] or inventory_hostname in groups['monasca-log-api'] or inventory_hostname in groups['monasca-log-transformer'] or inventory_hostname in groups['monasca-log-persister'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['monasca-api'] - name: Flush handlers meta: flush_handlers -- include: check.yml +- include_tasks: check.yml when: inventory_hostname in groups['monasca-api'] or inventory_hostname in groups['monasca-log-api'] or inventory_hostname in groups['monasca-log-transformer'] or diff --git a/ansible/roles/monasca/tasks/main.yml b/ansible/roles/monasca/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/monasca/tasks/main.yml +++ b/ansible/roles/monasca/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/monasca/tasks/reconfigure.yml b/ansible/roles/monasca/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/monasca/tasks/reconfigure.yml +++ b/ansible/roles/monasca/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/monasca/tasks/upgrade.yml b/ansible/roles/monasca/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/monasca/tasks/upgrade.yml +++ b/ansible/roles/monasca/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/mongodb/handlers/main.yml b/ansible/roles/mongodb/handlers/main.yml index a9e69d813f..6012fcbe5d 100644 --- a/ansible/roles/mongodb/handlers/main.yml +++ b/ansible/roles/mongodb/handlers/main.yml @@ -35,5 +35,5 @@ delegate_to: "{{ groups['mongodb'][0] }}" run_once: True -- include: "bootstrap_cluster.yml" +- include_tasks: "bootstrap_cluster.yml" when: mongodb_replication_status.stdout != "1" diff --git a/ansible/roles/mongodb/tasks/deploy.yml b/ansible/roles/mongodb/tasks/deploy.yml index 9eca42dec5..6f6feecec0 100644 --- a/ansible/roles/mongodb/tasks/deploy.yml +++ b/ansible/roles/mongodb/tasks/deploy.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/mongodb/tasks/main.yml b/ansible/roles/mongodb/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/mongodb/tasks/main.yml +++ b/ansible/roles/mongodb/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/mongodb/tasks/reconfigure.yml b/ansible/roles/mongodb/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/mongodb/tasks/reconfigure.yml +++ b/ansible/roles/mongodb/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/mongodb/tasks/upgrade.yml b/ansible/roles/mongodb/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/mongodb/tasks/upgrade.yml +++ b/ansible/roles/mongodb/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/multipathd/tasks/deploy.yml b/ansible/roles/multipathd/tasks/deploy.yml index 1f16915ad9..fae82a1da6 100644 --- a/ansible/roles/multipathd/tasks/deploy.yml +++ b/ansible/roles/multipathd/tasks/deploy.yml @@ -1,4 +1,4 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: start.yml +- include_tasks: start.yml diff --git a/ansible/roles/multipathd/tasks/main.yml b/ansible/roles/multipathd/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/multipathd/tasks/main.yml +++ b/ansible/roles/multipathd/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/multipathd/tasks/upgrade.yml b/ansible/roles/multipathd/tasks/upgrade.yml index 1f16915ad9..fae82a1da6 100644 --- a/ansible/roles/multipathd/tasks/upgrade.yml +++ b/ansible/roles/multipathd/tasks/upgrade.yml @@ -1,4 +1,4 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: start.yml +- include_tasks: start.yml diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml index 434e50cb21..3a26ab11c8 100644 --- a/ansible/roles/murano/tasks/bootstrap.yml +++ b/ansible/roles/murano/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/murano/tasks/deploy.yml b/ansible/roles/murano/tasks/deploy.yml index c125391d82..70d6017670 100644 --- a/ansible/roles/murano/tasks/deploy.yml +++ b/ansible/roles/murano/tasks/deploy.yml @@ -1,21 +1,21 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['murano-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['murano-api'] or inventory_hostname in groups['murano-engine'] -- include: clone.yml +- include_tasks: clone.yml when: - murano_dev_mode | bool - inventory_hostname in groups['murano-api'] or inventory_hostname in groups['murano-engine'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['murano-api'] - name: Flush handlers meta: flush_handlers -- include: import_library_packages.yml +- include_tasks: import_library_packages.yml diff --git a/ansible/roles/murano/tasks/main.yml b/ansible/roles/murano/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/murano/tasks/main.yml +++ b/ansible/roles/murano/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/murano/tasks/reconfigure.yml b/ansible/roles/murano/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/murano/tasks/reconfigure.yml +++ b/ansible/roles/murano/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/murano/tasks/upgrade.yml b/ansible/roles/murano/tasks/upgrade.yml index 301880cf1f..6d0f92f26b 100644 --- a/ansible/roles/murano/tasks/upgrade.yml +++ b/ansible/roles/murano/tasks/upgrade.yml @@ -1,9 +1,9 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers -- include: import_library_packages.yml +- include_tasks: import_library_packages.yml diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml index 16242365d6..837af0a27f 100644 --- a/ansible/roles/neutron/tasks/bootstrap.yml +++ b/ansible/roles/neutron/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml index 6066a05c7c..959e584888 100644 --- a/ansible/roles/neutron/tasks/deploy.yml +++ b/ansible/roles/neutron/tasks/deploy.yml @@ -1,17 +1,17 @@ --- -- include: ironic-check.yml +- include_tasks: ironic-check.yml -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['neutron-server'] -- include: config.yml +- include_tasks: config.yml -- include: config-neutron-fake.yml +- include_tasks: config-neutron-fake.yml when: - enable_nova_fake | bool - inventory_hostname in groups['compute'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['neutron-server'] - name: Flush Handlers diff --git a/ansible/roles/neutron/tasks/main.yml b/ansible/roles/neutron/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/neutron/tasks/main.yml +++ b/ansible/roles/neutron/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/neutron/tasks/reconfigure.yml b/ansible/roles/neutron/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/neutron/tasks/reconfigure.yml +++ b/ansible/roles/neutron/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/neutron/tasks/upgrade.yml b/ansible/roles/neutron/tasks/upgrade.yml index 973545e091..5585421b66 100644 --- a/ansible/roles/neutron/tasks/upgrade.yml +++ b/ansible/roles/neutron/tasks/upgrade.yml @@ -1,12 +1,12 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: config-neutron-fake.yml +- include_tasks: config-neutron-fake.yml when: - inventory_hostname in groups['compute'] - enable_nova_fake | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: inventory_hostname in groups['neutron-server'] - name: Flush Handlers diff --git a/ansible/roles/nova-hyperv/tasks/deploy.yml b/ansible/roles/nova-hyperv/tasks/deploy.yml index 77b95e96b3..9e64c36929 100644 --- a/ansible/roles/nova-hyperv/tasks/deploy.yml +++ b/ansible/roles/nova-hyperv/tasks/deploy.yml @@ -1,6 +1,6 @@ --- -- include: install.yml +- include_tasks: install.yml when: inventory_hostname in groups['hyperv'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['hyperv'] diff --git a/ansible/roles/nova-hyperv/tasks/main.yml b/ansible/roles/nova-hyperv/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/nova-hyperv/tasks/main.yml +++ b/ansible/roles/nova-hyperv/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/nova-hyperv/tasks/reconfigure.yml b/ansible/roles/nova-hyperv/tasks/reconfigure.yml index 56169f9727..a5d205a835 100644 --- a/ansible/roles/nova-hyperv/tasks/reconfigure.yml +++ b/ansible/roles/nova-hyperv/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: "deploy.yml" +- include_tasks: "deploy.yml" diff --git a/ansible/roles/nova/tasks/bootstrap.yml b/ansible/roles/nova/tasks/bootstrap.yml index 28172ff9f7..2818618d5b 100644 --- a/ansible/roles/nova/tasks/bootstrap.yml +++ b/ansible/roles/nova/tasks/bootstrap.yml @@ -48,5 +48,5 @@ - database.changed - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/nova/tasks/ceph.yml b/ansible/roles/nova/tasks/ceph.yml index 625bc0c288..2799784259 100644 --- a/ansible/roles/nova/tasks/ceph.yml +++ b/ansible/roles/nova/tasks/ceph.yml @@ -24,7 +24,7 @@ - "nova-libvirt" when: inventory_hostname in groups['compute'] -- include: ../../ceph_pools.yml +- include_tasks: ../../ceph_pools.yml vars: pool_name: "{{ nova_pool_name }}" pool_type: "{{ nova_pool_type }}" diff --git a/ansible/roles/nova/tasks/deploy.yml b/ansible/roles/nova/tasks/deploy.yml index b5e1f3e848..42a2672a5f 100644 --- a/ansible/roles/nova/tasks/deploy.yml +++ b/ansible/roles/nova/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: ceph.yml +- include_tasks: ceph.yml when: - enable_ceph | bool and nova_backend == "rbd" - inventory_hostname in groups['ceph-mon'] or @@ -10,31 +10,31 @@ inventory_hostname in groups['nova-novncproxy'] or inventory_hostname in groups['nova-scheduler'] -- include: external_ceph.yml +- include_tasks: external_ceph.yml when: - not enable_ceph | bool and nova_backend == "rbd" - inventory_hostname in groups['compute'] -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['nova-api'] -- include: bootstrap_xenapi.yml +- include_tasks: bootstrap_xenapi.yml when: - inventory_hostname in groups['compute'] - nova_compute_virt_type == "xenapi" -- include: config.yml +- include_tasks: config.yml -- include: config-nova-fake.yml +- include_tasks: config-nova-fake.yml when: - enable_nova_fake | bool - inventory_hostname in groups['compute'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['nova-api'] or inventory_hostname in groups['compute'] - name: Flush handlers meta: flush_handlers -- include: simple_cell_setup.yml +- include_tasks: simple_cell_setup.yml diff --git a/ansible/roles/nova/tasks/main.yml b/ansible/roles/nova/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/nova/tasks/main.yml +++ b/ansible/roles/nova/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/nova/tasks/reconfigure.yml b/ansible/roles/nova/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/nova/tasks/reconfigure.yml +++ b/ansible/roles/nova/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/nova/tasks/simple_cell_setup.yml b/ansible/roles/nova/tasks/simple_cell_setup.yml index 775842bda6..f5d393095c 100644 --- a/ansible/roles/nova/tasks/simple_cell_setup.yml +++ b/ansible/roles/nova/tasks/simple_cell_setup.yml @@ -11,7 +11,7 @@ run_once: True delegate_to: "{{ groups['nova-api'][0] }}" -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: map_cell0.changed - name: Create base cell for legacy instances diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml index 4fab8139d3..58dc7a9e42 100644 --- a/ansible/roles/nova/tasks/upgrade.yml +++ b/ansible/roles/nova/tasks/upgrade.yml @@ -1,8 +1,8 @@ --- # Create new set of configs on nodes -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Checking if conductor container needs upgrading become: true @@ -28,4 +28,4 @@ - name: Flush handlers meta: flush_handlers -- include: reload.yml +- include_tasks: reload.yml diff --git a/ansible/roles/octavia/tasks/bootstrap.yml b/ansible/roles/octavia/tasks/bootstrap.yml index 26a94c674b..0b4fc8b078 100644 --- a/ansible/roles/octavia/tasks/bootstrap.yml +++ b/ansible/roles/octavia/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/octavia/tasks/deploy.yml b/ansible/roles/octavia/tasks/deploy.yml index d289034be5..00466c7850 100644 --- a/ansible/roles/octavia/tasks/deploy.yml +++ b/ansible/roles/octavia/tasks/deploy.yml @@ -1,14 +1,14 @@ --- -- include: "register.yml" +- include_tasks: "register.yml" when: inventory_hostname in groups['octavia-api'] -- include: "config.yml" +- include_tasks: "config.yml" when: inventory_hostname in groups['octavia-api'] or inventory_hostname in groups['octavia-health-manager'] or inventory_hostname in groups['octavia-housekeeping'] or inventory_hostname in groups['octavia-worker'] -- include: "bootstrap.yml" +- include_tasks: "bootstrap.yml" when: inventory_hostname in groups['octavia-api'] - name: Flush handlers diff --git a/ansible/roles/octavia/tasks/main.yml b/ansible/roles/octavia/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/octavia/tasks/main.yml +++ b/ansible/roles/octavia/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/octavia/tasks/reconfigure.yml b/ansible/roles/octavia/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/octavia/tasks/reconfigure.yml +++ b/ansible/roles/octavia/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/octavia/tasks/upgrade.yml b/ansible/roles/octavia/tasks/upgrade.yml index ab84a3dda9..2d4777ab57 100644 --- a/ansible/roles/octavia/tasks/upgrade.yml +++ b/ansible/roles/octavia/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: "config.yml" +- include_tasks: "config.yml" -- include: "bootstrap_service.yml" +- include_tasks: "bootstrap_service.yml" - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/opendaylight/tasks/deploy.yml b/ansible/roles/opendaylight/tasks/deploy.yml index 5aac9f5a7f..ad915af159 100644 --- a/ansible/roles/opendaylight/tasks/deploy.yml +++ b/ansible/roles/opendaylight/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/opendaylight/tasks/main.yml b/ansible/roles/opendaylight/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/opendaylight/tasks/main.yml +++ b/ansible/roles/opendaylight/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/opendaylight/tasks/reconfigure.yml b/ansible/roles/opendaylight/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/opendaylight/tasks/reconfigure.yml +++ b/ansible/roles/opendaylight/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/opendaylight/tasks/upgrade.yml b/ansible/roles/opendaylight/tasks/upgrade.yml index 5aac9f5a7f..ad915af159 100644 --- a/ansible/roles/opendaylight/tasks/upgrade.yml +++ b/ansible/roles/opendaylight/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/openvswitch/tasks/deploy.yml b/ansible/roles/openvswitch/tasks/deploy.yml index 5aac9f5a7f..ad915af159 100644 --- a/ansible/roles/openvswitch/tasks/deploy.yml +++ b/ansible/roles/openvswitch/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/openvswitch/tasks/main.yml b/ansible/roles/openvswitch/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/openvswitch/tasks/main.yml +++ b/ansible/roles/openvswitch/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/openvswitch/tasks/reconfigure.yml b/ansible/roles/openvswitch/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/openvswitch/tasks/reconfigure.yml +++ b/ansible/roles/openvswitch/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/openvswitch/tasks/upgrade.yml b/ansible/roles/openvswitch/tasks/upgrade.yml index 5aac9f5a7f..ad915af159 100644 --- a/ansible/roles/openvswitch/tasks/upgrade.yml +++ b/ansible/roles/openvswitch/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/ovs-dpdk/tasks/deploy.yml b/ansible/roles/ovs-dpdk/tasks/deploy.yml index 5aac9f5a7f..ad915af159 100644 --- a/ansible/roles/ovs-dpdk/tasks/deploy.yml +++ b/ansible/roles/ovs-dpdk/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/ovs-dpdk/tasks/main.yml b/ansible/roles/ovs-dpdk/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/ovs-dpdk/tasks/main.yml +++ b/ansible/roles/ovs-dpdk/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/ovs-dpdk/tasks/reconfigure.yml b/ansible/roles/ovs-dpdk/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/ovs-dpdk/tasks/reconfigure.yml +++ b/ansible/roles/ovs-dpdk/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/ovs-dpdk/tasks/upgrade.yml b/ansible/roles/ovs-dpdk/tasks/upgrade.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/ovs-dpdk/tasks/upgrade.yml +++ b/ansible/roles/ovs-dpdk/tasks/upgrade.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/panko/tasks/bootstrap.yml b/ansible/roles/panko/tasks/bootstrap.yml index 3512d818e0..bf1cf23500 100644 --- a/ansible/roles/panko/tasks/bootstrap.yml +++ b/ansible/roles/panko/tasks/bootstrap.yml @@ -44,7 +44,7 @@ - not use_preconfigured_databases | bool - panko_database_type == "mysql" -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: (panko_database_type == "mongodb" and mongodb_panko_database.changed) or (panko_database_type == "mysql" and mysql_panko_database.changed) or use_preconfigured_databases | bool diff --git a/ansible/roles/panko/tasks/deploy.yml b/ansible/roles/panko/tasks/deploy.yml index 864362ba5f..7bc54ebbe5 100644 --- a/ansible/roles/panko/tasks/deploy.yml +++ b/ansible/roles/panko/tasks/deploy.yml @@ -1,9 +1,9 @@ --- -- include: register.yml +- include_tasks: register.yml -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/panko/tasks/main.yml b/ansible/roles/panko/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/panko/tasks/main.yml +++ b/ansible/roles/panko/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/panko/tasks/reconfigure.yml b/ansible/roles/panko/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/panko/tasks/reconfigure.yml +++ b/ansible/roles/panko/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/panko/tasks/upgrade.yml b/ansible/roles/panko/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/panko/tasks/upgrade.yml +++ b/ansible/roles/panko/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/prechecks/tasks/main.yml b/ansible/roles/prechecks/tasks/main.yml index 87ccb8f180..8614d29e1c 100644 --- a/ansible/roles/prechecks/tasks/main.yml +++ b/ansible/roles/prechecks/tasks/main.yml @@ -1,12 +1,12 @@ --- -- include: port_checks.yml +- include_tasks: port_checks.yml when: - inventory_hostname not in groups['deployment'] -- include: service_checks.yml +- include_tasks: service_checks.yml -- include: package_checks.yml +- include_tasks: package_checks.yml -- include: user_checks.yml +- include_tasks: user_checks.yml -- include: database_checks.yml +- include_tasks: database_checks.yml diff --git a/ansible/roles/prometheus/tasks/deploy.yml b/ansible/roles/prometheus/tasks/deploy.yml index 9eca42dec5..6f6feecec0 100644 --- a/ansible/roles/prometheus/tasks/deploy.yml +++ b/ansible/roles/prometheus/tasks/deploy.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/prometheus/tasks/main.yml b/ansible/roles/prometheus/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/prometheus/tasks/main.yml +++ b/ansible/roles/prometheus/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/prometheus/tasks/reconfigure.yml b/ansible/roles/prometheus/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/prometheus/tasks/reconfigure.yml +++ b/ansible/roles/prometheus/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/prometheus/tasks/upgrade.yml b/ansible/roles/prometheus/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/prometheus/tasks/upgrade.yml +++ b/ansible/roles/prometheus/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/qdrouterd/tasks/deploy.yml b/ansible/roles/qdrouterd/tasks/deploy.yml index fc4218ac0c..97df1dcc53 100644 --- a/ansible/roles/qdrouterd/tasks/deploy.yml +++ b/ansible/roles/qdrouterd/tasks/deploy.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers -- include: add_sasl_user.yml +- include_tasks: add_sasl_user.yml diff --git a/ansible/roles/qdrouterd/tasks/main.yml b/ansible/roles/qdrouterd/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/qdrouterd/tasks/main.yml +++ b/ansible/roles/qdrouterd/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/qdrouterd/tasks/reconfigure.yml b/ansible/roles/qdrouterd/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/qdrouterd/tasks/reconfigure.yml +++ b/ansible/roles/qdrouterd/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/qdrouterd/tasks/upgrade.yml b/ansible/roles/qdrouterd/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/qdrouterd/tasks/upgrade.yml +++ b/ansible/roles/qdrouterd/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/rabbitmq/tasks/deploy.yml b/ansible/roles/rabbitmq/tasks/deploy.yml index 9eca42dec5..6f6feecec0 100644 --- a/ansible/roles/rabbitmq/tasks/deploy.yml +++ b/ansible/roles/rabbitmq/tasks/deploy.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/rabbitmq/tasks/main.yml b/ansible/roles/rabbitmq/tasks/main.yml index 58231209f8..3e2e4f493e 100644 --- a/ansible/roles/rabbitmq/tasks/main.yml +++ b/ansible/roles/rabbitmq/tasks/main.yml @@ -1,3 +1,3 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" when: inventory_hostname in groups[role_rabbitmq_groups] diff --git a/ansible/roles/rabbitmq/tasks/reconfigure.yml b/ansible/roles/rabbitmq/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/rabbitmq/tasks/reconfigure.yml +++ b/ansible/roles/rabbitmq/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml index d015e6349a..5452fc4939 100644 --- a/ansible/roles/rabbitmq/tasks/upgrade.yml +++ b/ansible/roles/rabbitmq/tasks/upgrade.yml @@ -13,7 +13,7 @@ when: inventory_hostname in groups[role_rabbitmq_groups] register: rabbitmq_differs -- include: config.yml +- include_tasks: config.yml - name: Find gospel node command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node diff --git a/ansible/roles/rally/tasks/bootstrap.yml b/ansible/roles/rally/tasks/bootstrap.yml index d75360c33b..534fd857a0 100644 --- a/ansible/roles/rally/tasks/bootstrap.yml +++ b/ansible/roles/rally/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/rally/tasks/deploy.yml b/ansible/roles/rally/tasks/deploy.yml index 9eca42dec5..6f6feecec0 100644 --- a/ansible/roles/rally/tasks/deploy.yml +++ b/ansible/roles/rally/tasks/deploy.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/rally/tasks/main.yml b/ansible/roles/rally/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/rally/tasks/main.yml +++ b/ansible/roles/rally/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/rally/tasks/reconfigure.yml b/ansible/roles/rally/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/rally/tasks/reconfigure.yml +++ b/ansible/roles/rally/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/rally/tasks/upgrade.yml b/ansible/roles/rally/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/rally/tasks/upgrade.yml +++ b/ansible/roles/rally/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/redis/tasks/deploy.yml b/ansible/roles/redis/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/redis/tasks/deploy.yml +++ b/ansible/roles/redis/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/redis/tasks/main.yml b/ansible/roles/redis/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/redis/tasks/main.yml +++ b/ansible/roles/redis/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/redis/tasks/reconfigure.yml b/ansible/roles/redis/tasks/reconfigure.yml index 56169f9727..a5d205a835 100644 --- a/ansible/roles/redis/tasks/reconfigure.yml +++ b/ansible/roles/redis/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: "deploy.yml" +- include_tasks: "deploy.yml" diff --git a/ansible/roles/redis/tasks/upgrade.yml b/ansible/roles/redis/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/redis/tasks/upgrade.yml +++ b/ansible/roles/redis/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/sahara/tasks/bootstrap.yml b/ansible/roles/sahara/tasks/bootstrap.yml index d82ae2ec6e..6f99e5b6cd 100644 --- a/ansible/roles/sahara/tasks/bootstrap.yml +++ b/ansible/roles/sahara/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/sahara/tasks/deploy.yml b/ansible/roles/sahara/tasks/deploy.yml index c18f2f52b5..33942c9500 100644 --- a/ansible/roles/sahara/tasks/deploy.yml +++ b/ansible/roles/sahara/tasks/deploy.yml @@ -1,15 +1,15 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['sahara-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['sahara-api'] or inventory_hostname in groups['sahara-engine'] -- include: clone.yml +- include_tasks: clone.yml when: sahara_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['sahara-api'] - name: Flush handlers diff --git a/ansible/roles/sahara/tasks/main.yml b/ansible/roles/sahara/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/sahara/tasks/main.yml +++ b/ansible/roles/sahara/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/sahara/tasks/reconfigure.yml b/ansible/roles/sahara/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/sahara/tasks/reconfigure.yml +++ b/ansible/roles/sahara/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/sahara/tasks/upgrade.yml b/ansible/roles/sahara/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/sahara/tasks/upgrade.yml +++ b/ansible/roles/sahara/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/searchlight/tasks/bootstrap.yml b/ansible/roles/searchlight/tasks/bootstrap.yml index a537e12f78..bd1eaa05df 100644 --- a/ansible/roles/searchlight/tasks/bootstrap.yml +++ b/ansible/roles/searchlight/tasks/bootstrap.yml @@ -1,2 +1,2 @@ --- -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml diff --git a/ansible/roles/searchlight/tasks/deploy.yml b/ansible/roles/searchlight/tasks/deploy.yml index 864362ba5f..7bc54ebbe5 100644 --- a/ansible/roles/searchlight/tasks/deploy.yml +++ b/ansible/roles/searchlight/tasks/deploy.yml @@ -1,9 +1,9 @@ --- -- include: register.yml +- include_tasks: register.yml -- include: config.yml +- include_tasks: config.yml -- include: bootstrap.yml +- include_tasks: bootstrap.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/searchlight/tasks/main.yml b/ansible/roles/searchlight/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/searchlight/tasks/main.yml +++ b/ansible/roles/searchlight/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/searchlight/tasks/reconfigure.yml b/ansible/roles/searchlight/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/searchlight/tasks/reconfigure.yml +++ b/ansible/roles/searchlight/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/searchlight/tasks/upgrade.yml b/ansible/roles/searchlight/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/searchlight/tasks/upgrade.yml +++ b/ansible/roles/searchlight/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/senlin/tasks/bootstrap.yml b/ansible/roles/senlin/tasks/bootstrap.yml index cece215d46..8a82e834d6 100644 --- a/ansible/roles/senlin/tasks/bootstrap.yml +++ b/ansible/roles/senlin/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/senlin/tasks/deploy.yml b/ansible/roles/senlin/tasks/deploy.yml index b9792d9512..33fa32cf6e 100644 --- a/ansible/roles/senlin/tasks/deploy.yml +++ b/ansible/roles/senlin/tasks/deploy.yml @@ -1,15 +1,15 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['senlin-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['senlin-api'] or inventory_hostname in groups['senlin-engine'] -- include: clone.yml +- include_tasks: clone.yml when: senlin_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['senlin-api'] - name: Flush handlers diff --git a/ansible/roles/senlin/tasks/main.yml b/ansible/roles/senlin/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/senlin/tasks/main.yml +++ b/ansible/roles/senlin/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/senlin/tasks/reconfigure.yml b/ansible/roles/senlin/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/senlin/tasks/reconfigure.yml +++ b/ansible/roles/senlin/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/senlin/tasks/upgrade.yml b/ansible/roles/senlin/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/senlin/tasks/upgrade.yml +++ b/ansible/roles/senlin/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/skydive/tasks/deploy.yml b/ansible/roles/skydive/tasks/deploy.yml index 17e717a8b0..1281c2f54e 100644 --- a/ansible/roles/skydive/tasks/deploy.yml +++ b/ansible/roles/skydive/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['skydive-analyzer'] or inventory_hostname in groups['skydive-agent'] diff --git a/ansible/roles/skydive/tasks/main.yml b/ansible/roles/skydive/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/skydive/tasks/main.yml +++ b/ansible/roles/skydive/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/skydive/tasks/reconfigure.yml b/ansible/roles/skydive/tasks/reconfigure.yml index 56169f9727..a5d205a835 100644 --- a/ansible/roles/skydive/tasks/reconfigure.yml +++ b/ansible/roles/skydive/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: "deploy.yml" +- include_tasks: "deploy.yml" diff --git a/ansible/roles/skydive/tasks/upgrade.yml b/ansible/roles/skydive/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/skydive/tasks/upgrade.yml +++ b/ansible/roles/skydive/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/solum/tasks/bootstrap.yml b/ansible/roles/solum/tasks/bootstrap.yml index e8975bbdaa..0d3194c46d 100644 --- a/ansible/roles/solum/tasks/bootstrap.yml +++ b/ansible/roles/solum/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/solum/tasks/deploy.yml b/ansible/roles/solum/tasks/deploy.yml index 922adfaa0d..e750b24651 100644 --- a/ansible/roles/solum/tasks/deploy.yml +++ b/ansible/roles/solum/tasks/deploy.yml @@ -1,17 +1,17 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['solum-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['solum-api'] or inventory_hostname in groups['solum-deploy'] or inventory_hostname in groups['solum-worker'] or inventory_hostname in groups['solum-conductor'] -- include: clone.yml +- include_tasks: clone.yml when: solum_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['solum-api'] - name: Flush handlers diff --git a/ansible/roles/solum/tasks/main.yml b/ansible/roles/solum/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/solum/tasks/main.yml +++ b/ansible/roles/solum/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/solum/tasks/reconfigure.yml b/ansible/roles/solum/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/solum/tasks/reconfigure.yml +++ b/ansible/roles/solum/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/solum/tasks/upgrade.yml b/ansible/roles/solum/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/solum/tasks/upgrade.yml +++ b/ansible/roles/solum/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/stop/tasks/main.yml b/ansible/roles/stop/tasks/main.yml index ab994d374e..deb3ddfae1 100644 --- a/ansible/roles/stop/tasks/main.yml +++ b/ansible/roles/stop/tasks/main.yml @@ -1,4 +1,4 @@ --- -- include: copy_tools.yml +- include_tasks: copy_tools.yml -- include: stop_containers.yml +- include_tasks: stop_containers.yml diff --git a/ansible/roles/swift/tasks/deploy.yml b/ansible/roles/swift/tasks/deploy.yml index 0a9ab4fed3..5f8e486dc5 100644 --- a/ansible/roles/swift/tasks/deploy.yml +++ b/ansible/roles/swift/tasks/deploy.yml @@ -1,23 +1,23 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-object-server'] or inventory_hostname in groups['swift-proxy-server'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-object-server'] or inventory_hostname in groups['swift-proxy-server'] -- include: start.yml +- include_tasks: start.yml when: inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-object-server'] or inventory_hostname in groups['swift-proxy-server'] -- include: check.yml +- include_tasks: check.yml when: inventory_hostname in groups['swift-account-server'] or inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-object-server'] or diff --git a/ansible/roles/swift/tasks/main.yml b/ansible/roles/swift/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/swift/tasks/main.yml +++ b/ansible/roles/swift/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/swift/tasks/reconfigure.yml b/ansible/roles/swift/tasks/reconfigure.yml index 469ba8e176..4d46d54c7a 100644 --- a/ansible/roles/swift/tasks/reconfigure.yml +++ b/ansible/roles/swift/tasks/reconfigure.yml @@ -26,7 +26,7 @@ - { name: swift_rsyncd, group: swift-object-server } - { name: swift_proxy_server, group: swift-proxy-server } -- include: config.yml +- include_tasks: config.yml - name: Check the configs command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check @@ -113,7 +113,7 @@ - "{{ container_envs.results }}" - "{{ check_results.results }}" -- include: start.yml +- include_tasks: start.yml when: remove_containers.changed - name: Restart containers diff --git a/ansible/roles/swift/tasks/stop_and_start.yml b/ansible/roles/swift/tasks/stop_and_start.yml index c91da5d6ce..a3abd26bc0 100644 --- a/ansible/roles/swift/tasks/stop_and_start.yml +++ b/ansible/roles/swift/tasks/stop_and_start.yml @@ -26,4 +26,4 @@ - "swift_object_expirer" - "swift_proxy_server" -- include: start.yml +- include_tasks: start.yml diff --git a/ansible/roles/swift/tasks/upgrade.yml b/ansible/roles/swift/tasks/upgrade.yml index 667a6d45e8..6641d48540 100644 --- a/ansible/roles/swift/tasks/upgrade.yml +++ b/ansible/roles/swift/tasks/upgrade.yml @@ -1,4 +1,4 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: stop_and_start.yml +- include_tasks: stop_and_start.yml diff --git a/ansible/roles/tacker/tasks/bootstrap.yml b/ansible/roles/tacker/tasks/bootstrap.yml index 642d791b55..2f1c5309ac 100644 --- a/ansible/roles/tacker/tasks/bootstrap.yml +++ b/ansible/roles/tacker/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/tacker/tasks/deploy.yml b/ansible/roles/tacker/tasks/deploy.yml index 382792cae1..aad69c4fce 100644 --- a/ansible/roles/tacker/tasks/deploy.yml +++ b/ansible/roles/tacker/tasks/deploy.yml @@ -1,18 +1,18 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['tacker-server'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['tacker-server'] or inventory_hostname in groups['tacker-conductor'] -- include: clone.yml +- include_tasks: clone.yml when: - tacker_dev_mode | bool - inventory_hostname in groups['tacker-server'] or inventory_hostname in groups['tacker-conductor'] -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['tacker-server'] - name: Flush handlers diff --git a/ansible/roles/tacker/tasks/main.yml b/ansible/roles/tacker/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/tacker/tasks/main.yml +++ b/ansible/roles/tacker/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/tacker/tasks/reconfigure.yml b/ansible/roles/tacker/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/tacker/tasks/reconfigure.yml +++ b/ansible/roles/tacker/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/tacker/tasks/upgrade.yml b/ansible/roles/tacker/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/tacker/tasks/upgrade.yml +++ b/ansible/roles/tacker/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/telegraf/tasks/deploy.yml b/ansible/roles/telegraf/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/telegraf/tasks/deploy.yml +++ b/ansible/roles/telegraf/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/telegraf/tasks/main.yml b/ansible/roles/telegraf/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/telegraf/tasks/main.yml +++ b/ansible/roles/telegraf/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/telegraf/tasks/reconfigure.yml b/ansible/roles/telegraf/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/telegraf/tasks/reconfigure.yml +++ b/ansible/roles/telegraf/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/telegraf/tasks/upgrade.yml b/ansible/roles/telegraf/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/telegraf/tasks/upgrade.yml +++ b/ansible/roles/telegraf/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/tempest/tasks/deploy.yml b/ansible/roles/tempest/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/tempest/tasks/deploy.yml +++ b/ansible/roles/tempest/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/tempest/tasks/main.yml b/ansible/roles/tempest/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/tempest/tasks/main.yml +++ b/ansible/roles/tempest/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/tempest/tasks/reconfigure.yml b/ansible/roles/tempest/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/tempest/tasks/reconfigure.yml +++ b/ansible/roles/tempest/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/tempest/tasks/upgrade.yml b/ansible/roles/tempest/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/tempest/tasks/upgrade.yml +++ b/ansible/roles/tempest/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/trove/tasks/bootstrap.yml b/ansible/roles/trove/tasks/bootstrap.yml index f88c95b6ff..4befaf2068 100644 --- a/ansible/roles/trove/tasks/bootstrap.yml +++ b/ansible/roles/trove/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/trove/tasks/deploy.yml b/ansible/roles/trove/tasks/deploy.yml index 484571f6a5..d6f3357728 100644 --- a/ansible/roles/trove/tasks/deploy.yml +++ b/ansible/roles/trove/tasks/deploy.yml @@ -1,16 +1,16 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['trove-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['trove-api'] or inventory_hostname in groups['trove-conductor'] or inventory_hostname in groups['trove-taskmanager'] -- include: clone.yml +- include_tasks: clone.yml when: trove_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['trove-api'] - name: Flush handlers diff --git a/ansible/roles/trove/tasks/main.yml b/ansible/roles/trove/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/trove/tasks/main.yml +++ b/ansible/roles/trove/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/trove/tasks/reconfigure.yml b/ansible/roles/trove/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/trove/tasks/reconfigure.yml +++ b/ansible/roles/trove/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/trove/tasks/upgrade.yml b/ansible/roles/trove/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/trove/tasks/upgrade.yml +++ b/ansible/roles/trove/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/vitrage/tasks/bootstrap.yml b/ansible/roles/vitrage/tasks/bootstrap.yml index d29120c20e..8c57251e02 100644 --- a/ansible/roles/vitrage/tasks/bootstrap.yml +++ b/ansible/roles/vitrage/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/vitrage/tasks/deploy.yml b/ansible/roles/vitrage/tasks/deploy.yml index 67b6bacde2..84592499e3 100644 --- a/ansible/roles/vitrage/tasks/deploy.yml +++ b/ansible/roles/vitrage/tasks/deploy.yml @@ -1,18 +1,18 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['vitrage-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['vitrage-api'] or inventory_hostname in groups['vitrage-ml'] or inventory_hostname in groups['vitrage-graph'] or inventory_hostname in groups['vitrage-notifier'] or inventory_hostname in groups['vitrage-collector'] -- include: clone.yml +- include_tasks: clone.yml when: vitrage_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['vitrage-api'] - name: Flush handlers diff --git a/ansible/roles/vitrage/tasks/main.yml b/ansible/roles/vitrage/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/vitrage/tasks/main.yml +++ b/ansible/roles/vitrage/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/vitrage/tasks/reconfigure.yml b/ansible/roles/vitrage/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/vitrage/tasks/reconfigure.yml +++ b/ansible/roles/vitrage/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/vitrage/tasks/upgrade.yml b/ansible/roles/vitrage/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/vitrage/tasks/upgrade.yml +++ b/ansible/roles/vitrage/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/vmtp/tasks/deploy.yml b/ansible/roles/vmtp/tasks/deploy.yml index 5268b68025..aac98e6473 100644 --- a/ansible/roles/vmtp/tasks/deploy.yml +++ b/ansible/roles/vmtp/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['vmtp'] - name: Flush handlers diff --git a/ansible/roles/vmtp/tasks/main.yml b/ansible/roles/vmtp/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/vmtp/tasks/main.yml +++ b/ansible/roles/vmtp/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/vmtp/tasks/reconfigure.yml b/ansible/roles/vmtp/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/vmtp/tasks/reconfigure.yml +++ b/ansible/roles/vmtp/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/vmtp/tasks/upgrade.yml b/ansible/roles/vmtp/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/vmtp/tasks/upgrade.yml +++ b/ansible/roles/vmtp/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/watcher/tasks/bootstrap.yml b/ansible/roles/watcher/tasks/bootstrap.yml index 3f80a50239..e0d0dc3a4f 100644 --- a/ansible/roles/watcher/tasks/bootstrap.yml +++ b/ansible/roles/watcher/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/watcher/tasks/deploy.yml b/ansible/roles/watcher/tasks/deploy.yml index 3383b08d5f..94e04756ba 100644 --- a/ansible/roles/watcher/tasks/deploy.yml +++ b/ansible/roles/watcher/tasks/deploy.yml @@ -1,16 +1,16 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['watcher-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['watcher-api'] or inventory_hostname in groups['watcher-engine'] or inventory_hostname in groups['watcher-applier'] -- include: clone.yml +- include_tasks: clone.yml when: watcher_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['watcher-api'] - name: Flush handlers diff --git a/ansible/roles/watcher/tasks/main.yml b/ansible/roles/watcher/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/watcher/tasks/main.yml +++ b/ansible/roles/watcher/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/watcher/tasks/reconfigure.yml b/ansible/roles/watcher/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/watcher/tasks/reconfigure.yml +++ b/ansible/roles/watcher/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/watcher/tasks/upgrade.yml b/ansible/roles/watcher/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/watcher/tasks/upgrade.yml +++ b/ansible/roles/watcher/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/zookeeper/tasks/deploy.yml b/ansible/roles/zookeeper/tasks/deploy.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/zookeeper/tasks/deploy.yml +++ b/ansible/roles/zookeeper/tasks/deploy.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/zookeeper/tasks/main.yml b/ansible/roles/zookeeper/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/zookeeper/tasks/main.yml +++ b/ansible/roles/zookeeper/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/zookeeper/tasks/reconfigure.yml b/ansible/roles/zookeeper/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/zookeeper/tasks/reconfigure.yml +++ b/ansible/roles/zookeeper/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/zookeeper/tasks/upgrade.yml b/ansible/roles/zookeeper/tasks/upgrade.yml index dd26ecc34d..375dcad19b 100644 --- a/ansible/roles/zookeeper/tasks/upgrade.yml +++ b/ansible/roles/zookeeper/tasks/upgrade.yml @@ -1,5 +1,5 @@ --- -- include: config.yml +- include_tasks: config.yml - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/zun/tasks/bootstrap.yml b/ansible/roles/zun/tasks/bootstrap.yml index 1c727c7149..c794cdbfe6 100644 --- a/ansible/roles/zun/tasks/bootstrap.yml +++ b/ansible/roles/zun/tasks/bootstrap.yml @@ -32,5 +32,5 @@ when: - not use_preconfigured_databases | bool -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml when: database.changed or use_preconfigured_databases | bool diff --git a/ansible/roles/zun/tasks/deploy.yml b/ansible/roles/zun/tasks/deploy.yml index 15e3410d4f..c2966d9cca 100644 --- a/ansible/roles/zun/tasks/deploy.yml +++ b/ansible/roles/zun/tasks/deploy.yml @@ -1,15 +1,15 @@ --- -- include: register.yml +- include_tasks: register.yml when: inventory_hostname in groups['zun-api'] -- include: config.yml +- include_tasks: config.yml when: inventory_hostname in groups['zun-api'] or inventory_hostname in groups['zun-compute'] -- include: clone.yml +- include_tasks: clone.yml when: zun_dev_mode | bool -- include: bootstrap.yml +- include_tasks: bootstrap.yml when: inventory_hostname in groups['zun-api'] - name: Flush handlers diff --git a/ansible/roles/zun/tasks/main.yml b/ansible/roles/zun/tasks/main.yml index 49a33b8492..bc5d1e6257 100644 --- a/ansible/roles/zun/tasks/main.yml +++ b/ansible/roles/zun/tasks/main.yml @@ -1,2 +1,2 @@ --- -- include: "{{ kolla_action }}.yml" +- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/zun/tasks/reconfigure.yml b/ansible/roles/zun/tasks/reconfigure.yml index e078ef1318..f670a5b78d 100644 --- a/ansible/roles/zun/tasks/reconfigure.yml +++ b/ansible/roles/zun/tasks/reconfigure.yml @@ -1,2 +1,2 @@ --- -- include: deploy.yml +- include_tasks: deploy.yml diff --git a/ansible/roles/zun/tasks/upgrade.yml b/ansible/roles/zun/tasks/upgrade.yml index c38db1adf4..20ccddc8f1 100644 --- a/ansible/roles/zun/tasks/upgrade.yml +++ b/ansible/roles/zun/tasks/upgrade.yml @@ -1,7 +1,7 @@ --- -- include: config.yml +- include_tasks: config.yml -- include: bootstrap_service.yml +- include_tasks: bootstrap_service.yml - name: Flush handlers meta: flush_handlers diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh index acb4682aba..86e583deef 100755 --- a/tools/setup_gate.sh +++ b/tools/setup_gate.sh @@ -86,7 +86,7 @@ function setup_ansible { RAW_INVENTORY=/etc/kolla/inventory # TODO(SamYaple): Move to virtualenv - sudo -H pip install -U "ansible>=2,<2.4" "docker>=2.0.0" "python-openstackclient" "python-neutronclient" "ara" "cmd2<0.9.0" + sudo -H pip install -U "ansible>=2.4" "docker>=2.0.0" "python-openstackclient" "python-neutronclient" "ara" "cmd2<0.9.0" detect_distro sudo mkdir /etc/ansible