From 90afd05d3a6c0a52b9931d5a75b7b4b75a5aa56f Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Mon, 31 Dec 2018 16:50:39 +0000 Subject: [PATCH] Replace obsoleted include with import_playbook Resolves runtime Ansible deprecation warnings caused by use of old syntax. Change-Id: Iaa8eface3dc58a828e0da74b1b56a6038f143060 --- .../baremetal-virt-undercloud-int-browbeat.yml | 16 ++++++++-------- ...aremetal-virt-undercloud-tripleo-browbeat.yml | 16 ++++++++-------- .../baremetal-virt-undercloud-yoda-browbeat.yml | 4 ++-- ansible/oooq/browbeat-minimal.yml | 6 +++--- ansible/oooq/quickstart-browbeat.yml | 12 ++++++------ 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ansible/oooq/baremetal-virt-undercloud-int-browbeat.yml b/ansible/oooq/baremetal-virt-undercloud-int-browbeat.yml index b60770821..027bb5275 100644 --- a/ansible/oooq/baremetal-virt-undercloud-int-browbeat.yml +++ b/ansible/oooq/baremetal-virt-undercloud-int-browbeat.yml @@ -1,20 +1,20 @@ --- # Browbeat integration test -- include: baremetal-prep-virthost.yml +- import_playbook: baremetal-prep-virthost.yml -- include: configure-browbeat.yml +- import_playbook: configure-browbeat.yml -- include: baremetal-quickstart-extras.yml +- import_playbook: baremetal-quickstart-extras.yml -- include: install-browbeat.yml +- import_playbook: install-browbeat.yml -- include: disable-ssh-dns.yml +- import_playbook: disable-ssh-dns.yml -- include: undercloud-metrics.yml -- include: overcloud-metrics.yml +- import_playbook: undercloud-metrics.yml +- import_playbook: overcloud-metrics.yml -- include: gather-metadata.yml +- import_playbook: gather-metadata.yml - name: Run Browbeat hosts: undercloud diff --git a/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml b/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml index e3d4cf717..3c0aae4ae 100644 --- a/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml +++ b/ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml @@ -1,18 +1,18 @@ --- -- include: baremetal-prep-virthost.yml +- import_playbook: baremetal-prep-virthost.yml -- include: configure-browbeat.yml +- import_playbook: configure-browbeat.yml -- include: baremetal-quickstart-extras.yml +- import_playbook: baremetal-quickstart-extras.yml -- include: install-browbeat.yml +- import_playbook: install-browbeat.yml -- include: disable-ssh-dns.yml +- import_playbook: disable-ssh-dns.yml -- include: undercloud-metrics.yml -- include: overcloud-metrics.yml +- import_playbook: undercloud-metrics.yml +- import_playbook: overcloud-metrics.yml -- include: gather-metadata.yml +- import_playbook: gather-metadata.yml - name: Run Browbeat hosts: undercloud diff --git a/ansible/oooq/baremetal-virt-undercloud-yoda-browbeat.yml b/ansible/oooq/baremetal-virt-undercloud-yoda-browbeat.yml index 2507367f7..647144bde 100644 --- a/ansible/oooq/baremetal-virt-undercloud-yoda-browbeat.yml +++ b/ansible/oooq/baremetal-virt-undercloud-yoda-browbeat.yml @@ -1,5 +1,5 @@ --- -- include: baremetal-prep-virthost.yml +- import_playbook: baremetal-prep-virthost.yml - name: Validate IPMI and instackenv.json @@ -14,7 +14,7 @@ roles: - undercloud-deploy -- include: undercloud-metrics.yml +- import_playbook: undercloud-metrics.yml - name: copy over config files hosts: undercloud diff --git a/ansible/oooq/browbeat-minimal.yml b/ansible/oooq/browbeat-minimal.yml index 1783b5e03..e93a4ff5d 100644 --- a/ansible/oooq/browbeat-minimal.yml +++ b/ansible/oooq/browbeat-minimal.yml @@ -2,13 +2,13 @@ # Browbeat integration test # Check upstream zuul CI -- include: configure-browbeat.yml +- import_playbook: configure-browbeat.yml when: enable_minimal_browbeat|default(false)|bool -- include: install-browbeat.yml +- import_playbook: install-browbeat.yml when: enable_minimal_browbeat|default(false)|bool -- include: disable-ssh-dns.yml +- import_playbook: disable-ssh-dns.yml when: enable_minimal_browbeat|default(false)|bool - name: Run Browbeat diff --git a/ansible/oooq/quickstart-browbeat.yml b/ansible/oooq/quickstart-browbeat.yml index d4cdda821..35a24a035 100644 --- a/ansible/oooq/quickstart-browbeat.yml +++ b/ansible/oooq/quickstart-browbeat.yml @@ -1,16 +1,16 @@ # This is the playbook used by the `quickstart.sh` script. -- include: quickstart-extras.yml +- import_playbook: quickstart-extras.yml -- include: configure-browbeat.yml +- import_playbook: configure-browbeat.yml -- include: undercloud-metrics.yml +- import_playbook: undercloud-metrics.yml -- include: overcloud-metrics.yml +- import_playbook: overcloud-metrics.yml -- include: install-browbeat.yml +- import_playbook: install-browbeat.yml -- include: gather-metadata.yml +- import_playbook: gather-metadata.yml - name: Run Browbeat hosts: undercloud