Skip to content

Commit

Permalink
Replace obsoleted include with import_playbook
Browse files Browse the repository at this point in the history
Resolves runtime Ansible deprecation warnings caused by use of old
syntax.

Change-Id: Iaa8eface3dc58a828e0da74b1b56a6038f143060
  • Loading branch information
ssbarnea committed Dec 31, 2018
1 parent 310f3e3 commit 90afd05
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
16 changes: 8 additions & 8 deletions ansible/oooq/baremetal-virt-undercloud-int-browbeat.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 8 additions & 8 deletions ansible/oooq/baremetal-virt-undercloud-tripleo-browbeat.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ansible/oooq/baremetal-virt-undercloud-yoda-browbeat.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
- include: baremetal-prep-virthost.yml
- import_playbook: baremetal-prep-virthost.yml


- name: Validate IPMI and instackenv.json
Expand All @@ -14,7 +14,7 @@
roles:
- undercloud-deploy

- include: undercloud-metrics.yml
- import_playbook: undercloud-metrics.yml

- name: copy over config files
hosts: undercloud
Expand Down
6 changes: 3 additions & 3 deletions ansible/oooq/browbeat-minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions ansible/oooq/quickstart-browbeat.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 90afd05

Please sign in to comment.