summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Sbarnea <ssbarnea@redhat.com>2018-11-16 12:42:51 +0000
committerSorin Sbarnea <ssbarnea@redhat.com>2018-11-16 12:42:51 +0000
commitcc82349363cd963059a4f241a1d30ede69b3d744 (patch)
tree5061b05c45d4de22daba654216d89a958c772955
parent712b4da542f3d689181c866e7d791e0b1b712d67 (diff)
Adapt code to newer code style (linters)
Makes those files conformant with current linting rules and avoids linting errors when we need to toch them again. Previous doing "pre-commit run -a" uncovered these errors, now is no longer reporting any other errors. Change-Id: Ie4cf229c8f11c2b55b323eac23c89483b26d3781
Notes
Notes (review): Code-Review+1: Luigi Toscano <ltoscano@redhat.com> Code-Review+2: Sagi Shnaidman <sshnaidm@redhat.com> Code-Review+1: Chandan Kumar <chkumar@redhat.com> Code-Review+2: Ronelle Landy <rlandy@redhat.com> Workflow+1: Sagi Shnaidman <sshnaidm@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 20 Nov 2018 06:34:00 +0000 Reviewed-on: https://review.openstack.org/618518 Project: openstack/tripleo-quickstart-extras Branch: refs/heads/master
-rw-r--r--playbooks/baremetal-full-overcloud-prep.yml46
-rw-r--r--playbooks/baremetal-full-overcloud-validate.yml29
-rw-r--r--playbooks/baremetal-full-overcloud.yml19
-rw-r--r--playbooks/baremetal-full-undercloud.yml20
-rw-r--r--playbooks/baremetal-prep-virthost.yml13
-rw-r--r--playbooks/baremetal-undercloud.yml8
-rw-r--r--playbooks/build-images-v2.yml4
-rw-r--r--playbooks/build-test-packages.yml4
-rw-r--r--playbooks/cleanup-destructive.yml4
-rw-r--r--playbooks/collect-logs.yml8
-rw-r--r--playbooks/deploy-delete.yml9
-rw-r--r--playbooks/multinode-overcloud-prep.yml23
-rw-r--r--playbooks/multinode-overcloud-update.yml3
-rw-r--r--playbooks/multinode-overcloud-upgrade.yml7
-rw-r--r--playbooks/multinode-overcloud.yml9
-rw-r--r--playbooks/multinode-standalone-upgrade.yml6
-rw-r--r--playbooks/multinode-standalone.yml8
-rw-r--r--playbooks/multinode-undercloud.yml12
-rw-r--r--playbooks/multinode-validate.yml12
-rw-r--r--playbooks/nodepool-setup.yml4
-rw-r--r--playbooks/ovb-setup.yml44
-rw-r--r--playbooks/provision_multinodes.yml2
-rw-r--r--playbooks/quickstart-extras-overcloud-prep.yml37
-rw-r--r--playbooks/quickstart-extras-overcloud.yml17
-rw-r--r--playbooks/quickstart-extras-undercloud.yml22
-rw-r--r--playbooks/quickstart-extras-validate.yml23
-rw-r--r--playbooks/repo-setup.yml4
-rw-r--r--playbooks/scale_nodes_verify.yml4
-rw-r--r--playbooks/snapshot-libvirt.yml9
-rw-r--r--playbooks/tempest.yml4
-rw-r--r--playbooks/tripleo-validations.yml15
-rw-r--r--roles/baremetal-prep-overcloud/README.md2
-rw-r--r--roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml4
-rw-r--r--roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml2
-rw-r--r--roles/baremetal-prep-virthost/README.md2
-rw-r--r--roles/baremetal-prep-virthost/tasks/main.yml2
-rw-r--r--roles/baremetal-undercloud/README.md16
-rw-r--r--roles/build-test-packages/tasks/main.yml56
-rw-r--r--roles/collect-logs/tasks/ara_influxdb.yml2
-rw-r--r--roles/collect-logs/tasks/collect.yml10
-rw-r--r--roles/collect-logs/tasks/create-docs.yml12
-rw-r--r--roles/collect-logs/tasks/publish.yml14
-rw-r--r--roles/freeipa-setup/README.md2
-rw-r--r--roles/install-built-repo/README.md4
-rw-r--r--roles/multinodes/README.md2
-rw-r--r--roles/overcloud-prep-flavors/README.md2
-rw-r--r--roles/overcloud-prep-images/README.md2
-rw-r--r--roles/overcloud-prep-network/README.md2
-rw-r--r--roles/snapshot-libvirt/README.md4
-rw-r--r--roles/undercloud-deploy/README.md4
-rw-r--r--roles/undercloud-setup/README.md2
-rw-r--r--roles/undercloud-setup/tasks/ovb_setup_connectivity.yml2
-rw-r--r--roles/validate-tempest/README.md2
-rw-r--r--roles/validate-tempest/tasks/main.yml2
-rw-r--r--roles/validate-tempest/tasks/pre-tempest.yml27
-rw-r--r--roles/validate-tempest/tasks/tempest-results.yml7
-rw-r--r--roles/validate-tempest/tasks/tempest-rpm.yml6
-rw-r--r--roles/validate-ui/defaults/main.yml2
-rw-r--r--roles/validate-ui/meta/main.yml1
-rw-r--r--roles/virthost-full-cleanup/meta/main.yml1
-rw-r--r--roles/virthost-full-cleanup/tasks/main.yml65
-rw-r--r--zuul.d/layout.yaml1
62 files changed, 357 insertions, 334 deletions
diff --git a/playbooks/baremetal-full-overcloud-prep.yml b/playbooks/baremetal-full-overcloud-prep.yml
index 76034e3..0662fc8 100644
--- a/playbooks/baremetal-full-overcloud-prep.yml
+++ b/playbooks/baremetal-full-overcloud-prep.yml
@@ -1,79 +1,79 @@
1--- 1---
2- name: Prepare the undercloud networks for the overcloud deployment 2- name: Prepare the undercloud networks for the overcloud deployment
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: no 4 gather_facts: false
5 roles: 5 roles:
6 - overcloud-prep-network 6 - overcloud-prep-network
7 tags: 7 tags:
8 - overcloud-prep-network 8 - overcloud-prep-network
9 9
10- name: copy over config files 10- name: copy over config files
11 hosts: undercloud 11 hosts: undercloud
12 gather_facts: no 12 gather_facts: false
13 roles: 13 roles:
14 - overcloud-prep-config 14 - overcloud-prep-config
15 tags: 15 tags:
16 - overcloud-prep-config 16 - overcloud-prep-config
17 17
18- name: Perpare the baremetal overcloud 18- name: Perpare the baremetal overcloud
19 hosts: undercloud 19 hosts: undercloud
20 gather_facts: yes 20 gather_facts: true
21 roles: 21 roles:
22 - baremetal-prep-overcloud 22 - baremetal-prep-overcloud
23 tags: 23 tags:
24 - baremetal-prep-overcloud 24 - baremetal-prep-overcloud
25 25
26- name: Prepare overcloud containers 26- name: Prepare overcloud containers
27 hosts: undercloud 27 hosts: undercloud
28 gather_facts: no 28 gather_facts: false
29 roles: 29 roles:
30 - { role: overcloud-prep-containers, when: containerized_overcloud|bool } 30 - {role: overcloud-prep-containers, when: containerized_overcloud|bool}
31 tags: 31 tags:
32 - overcloud-prep-containers 32 - overcloud-prep-containers
33 33
34- name: Run tripleo-validations pre-introspection tests 34- name: Run tripleo-validations pre-introspection tests
35 hosts: undercloud 35 hosts: undercloud
36 gather_facts: no 36 gather_facts: false
37 tags: 37 tags:
38 - tripleo-validations 38 - tripleo-validations
39 vars: 39 vars:
40 validations_group: ['pre-introspection'] 40 validations_group: ['pre-introspection']
41 roles: 41 roles:
42 - { role: tripleo-validations, 42 - {role: tripleo-validations,
43 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 43 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
44 44
45- name: Prepare the overcloud images for deployment 45- name: Prepare the overcloud images for deployment
46 hosts: undercloud 46 hosts: undercloud
47 gather_facts: no 47 gather_facts: false
48 roles: 48 roles:
49 - overcloud-prep-images 49 - overcloud-prep-images
50 tags: 50 tags:
51 - overcloud-prep-images 51 - overcloud-prep-images
52 52
53- name: Prepare overcloud flavors 53- name: Prepare overcloud flavors
54 hosts: undercloud 54 hosts: undercloud
55 gather_facts: no 55 gather_facts: false
56 roles: 56 roles:
57 - { role: overcloud-prep-flavors, 57 - {role: overcloud-prep-flavors,
58 when: step_overcloud_prep_flavors|default(true)|bool } 58 when: step_overcloud_prep_flavors|default(true)|bool}
59 tags: 59 tags:
60 - overcloud-prep-flavors 60 - overcloud-prep-flavors
61 61
62- name: Prepare the SSL Configuration for the overcloud deployment 62- name: Prepare the SSL Configuration for the overcloud deployment
63 hosts: undercloud 63 hosts: undercloud
64 gather_facts: no 64 gather_facts: false
65 roles: 65 roles:
66 - { role: overcloud-ssl } 66 - {role: overcloud-ssl}
67 tags: 67 tags:
68 - overcloud-ssl 68 - overcloud-ssl
69 69
70- name: Run tripleo-validations pre-deployment tests 70- name: Run tripleo-validations pre-deployment tests
71 hosts: undercloud 71 hosts: undercloud
72 gather_facts: no 72 gather_facts: false
73 tags: 73 tags:
74 - tripleo-validations 74 - tripleo-validations
75 vars: 75 vars:
76 validations_group: ['pre-deployment'] 76 validations_group: ['pre-deployment']
77 roles: 77 roles:
78 - { role: tripleo-validations, 78 - {role: tripleo-validations,
79 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 79 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
diff --git a/playbooks/baremetal-full-overcloud-validate.yml b/playbooks/baremetal-full-overcloud-validate.yml
index 7610016..38857d8 100644
--- a/playbooks/baremetal-full-overcloud-validate.yml
+++ b/playbooks/baremetal-full-overcloud-validate.yml
@@ -5,43 +5,42 @@
5 tags: 5 tags:
6 - overcloud-validate 6 - overcloud-validate
7 roles: 7 roles:
8 - { role: validate-perf, 8 - {role: validate-perf,
9 when: validate_performance|bool and run_tempest|bool } 9 when: validate_performance|bool and run_tempest|bool}
10 ignore_errors: true 10 ignore_errors: true
11 11
12- name: Sanity check the overcloud services 12- name: Sanity check the overcloud services
13 hosts: undercloud 13 hosts: undercloud
14 tags: 14 tags:
15 - overcloud-validate 15 - overcloud-validate
16 gather_facts: no 16 gather_facts: false
17 roles: 17 roles:
18 - { role: validate-sanity-checks, 18 - {role: validate-sanity-checks,
19 when: run_sanity_checks|default(false)|bool } 19 when: run_sanity_checks|default(false)|bool}
20 20
21# Validate the deployment 21# Validate the deployment
22- name: validate the overcloud 22- name: validate the overcloud
23 hosts: undercloud 23 hosts: undercloud
24 tags: 24 tags:
25 - overcloud-validate 25 - overcloud-validate
26 gather_facts: no 26 gather_facts: false
27 roles: 27 roles:
28 - { role: validate-simple, when: test_ping|bool } 28 - {role: validate-simple, when: test_ping|bool}
29 29
30# Execute tempest against the overcloud deployment 30# Execute tempest against the overcloud deployment
31- name: Execute tempest against the overcloud 31- name: Execute tempest against the overcloud
32 hosts: undercloud 32 hosts: undercloud
33 tags: 33 tags:
34 - overcloud-validate 34 - overcloud-validate
35 gather_facts: no 35 gather_facts: false
36 roles: 36 roles:
37 - { role: validate-tempest, when: run_tempest|bool } 37 - {role: validate-tempest, when: run_tempest|bool}
38 38
39- name: Delete the overcloud 39- name: Delete the overcloud
40 hosts: undercloud 40 hosts: undercloud
41 tags: 41 tags:
42 - overcloud-delete 42 - overcloud-delete
43 gather_facts: no 43 gather_facts: false
44 roles: 44 roles:
45 - { role: overcloud-delete, 45 - {role: overcloud-delete,
46 when: step_delete_overcloud|default(false)|bool } 46 when: step_delete_overcloud|default(false)|bool}
47
diff --git a/playbooks/baremetal-full-overcloud.yml b/playbooks/baremetal-full-overcloud.yml
index f3598e5..78d8b9c 100644
--- a/playbooks/baremetal-full-overcloud.yml
+++ b/playbooks/baremetal-full-overcloud.yml
@@ -1,24 +1,24 @@
1--- 1---
2- name: Deploy the overcloud 2- name: Deploy the overcloud
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: no 4 gather_facts: false
5 roles: 5 roles:
6 - overcloud-deploy 6 - overcloud-deploy
7 tags: 7 tags:
8 - overcloud-deploy 8 - overcloud-deploy
9 9
10# Add the overcloud nodes to the generated inventory. 10# Add the overcloud nodes to the generated inventory.
11- name: Inventory the overcloud 11- name: Inventory the overcloud
12 hosts: undercloud 12 hosts: undercloud
13 gather_facts: yes 13 gather_facts: true
14 tags: 14 tags:
15 - overcloud-deploy 15 - overcloud-deploy
16 vars: 16 vars:
17 inventory: all 17 inventory: all
18 roles: 18 roles:
19 - tripleo-inventory 19 - tripleo-inventory
20 20
21- name: Check the result of the deployment 21- name: Check the result of the deployment
22 hosts: localhost 22 hosts: localhost
23 tags: 23 tags:
24 - overcloud-deploy 24 - overcloud-deploy
@@ -33,12 +33,11 @@
33 33
34- name: Run tripleo-validations post-deployment tests 34- name: Run tripleo-validations post-deployment tests
35 hosts: undercloud 35 hosts: undercloud
36 gather_facts: no 36 gather_facts: false
37 tags: 37 tags:
38 - tripleo-validations 38 - tripleo-validations
39 vars: 39 vars:
40 validations_group: ['post-deployment'] 40 validations_group: ['post-deployment']
41 roles: 41 roles:
42 - { role: tripleo-validations, 42 - {role: tripleo-validations,
43 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 43 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
44
diff --git a/playbooks/baremetal-full-undercloud.yml b/playbooks/baremetal-full-undercloud.yml
index 9eeee31..b75c0fe 100644
--- a/playbooks/baremetal-full-undercloud.yml
+++ b/playbooks/baremetal-full-undercloud.yml
@@ -1,7 +1,7 @@
1--- 1---
2- name: Deploy the undercloud 2- name: Deploy the undercloud
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: yes 4 gather_facts: true
5 roles: 5 roles:
6 - undercloud-deploy 6 - undercloud-deploy
7 tags: 7 tags:
@@ -9,28 +9,28 @@
9 9
10- name: Configure tripleo-validations 10- name: Configure tripleo-validations
11 hosts: undercloud 11 hosts: undercloud
12 gather_facts: no 12 gather_facts: false
13 tags: 13 tags:
14 - tripleo-validations 14 - tripleo-validations
15 vars: 15 vars:
16 run_tripleo_validations_setup: True 16 run_tripleo_validations_setup: true
17 roles: 17 roles:
18 - { role: tripleo-validations, 18 - {role: tripleo-validations,
19 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 19 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
20 20
21- name: Validate the undercloud 21- name: Validate the undercloud
22 hosts: undercloud 22 hosts: undercloud
23 roles: 23 roles:
24 - { role: validate-undercloud, 24 - {role: validate-undercloud,
25 when: run_validate_undercloud|default(false)|bool } 25 when: run_validate_undercloud|default(false)|bool}
26 tags: 26 tags:
27 - validate-undercloud 27 - validate-undercloud
28 28
29- name: Build images for quickstart 29- name: Build images for quickstart
30 hosts: undercloud 30 hosts: undercloud
31 gather_facts: no 31 gather_facts: false
32 roles: 32 roles:
33 - { role: build-images, when: to_build|default(false)|bool } 33 - {role: build-images, when: to_build|default(false)|bool}
34 tags: 34 tags:
35 - get-images 35 - get-images
36 - images 36 - images
diff --git a/playbooks/baremetal-prep-virthost.yml b/playbooks/baremetal-prep-virthost.yml
index 8ea3952..59dcbc2 100644
--- a/playbooks/baremetal-prep-virthost.yml
+++ b/playbooks/baremetal-prep-virthost.yml
@@ -34,25 +34,24 @@
34 roles: 34 roles:
35 - environment/setup 35 - environment/setup
36 36
37- name: Setup undercloud and baremetal vms and networks in libvirt 37- name: Setup undercloud and baremetal vms and networks in libvirt
38 hosts: virthost 38 hosts: virthost
39 gather_facts: yes 39 gather_facts: true
40 roles: 40 roles:
41 - libvirt/setup 41 - libvirt/setup
42 42
43# Add the undercloud node to the generated 43# Add the undercloud node to the generated
44# inventory. 44# inventory.
45- name: Inventory the undercloud 45- name: Inventory the undercloud
46 hosts: localhost 46 hosts: localhost
47 gather_facts: yes 47 gather_facts: true
48 vars: 48 vars:
49 inventory: undercloud 49 inventory: undercloud
50 roles: 50 roles:
51 - tripleo-inventory 51 - tripleo-inventory
52 52
53- name: Prepare the host for PXE forwarding 53- name: Prepare the host for PXE forwarding
54 hosts: virthost 54 hosts: virthost
55 gather_facts: no 55 gather_facts: false
56 roles: 56 roles:
57 - baremetal-prep-virthost 57 - baremetal-prep-virthost
58
diff --git a/playbooks/baremetal-undercloud.yml b/playbooks/baremetal-undercloud.yml
index 9b80625..f768f45 100644
--- a/playbooks/baremetal-undercloud.yml
+++ b/playbooks/baremetal-undercloud.yml
@@ -8,7 +8,7 @@
8 8
9- name: Add the undercloud node to the generated inventory 9- name: Add the undercloud node to the generated inventory
10 hosts: localhost 10 hosts: localhost
11 gather_facts: yes 11 gather_facts: true
12 roles: 12 roles:
13 - tripleo-inventory 13 - tripleo-inventory
14 tags: 14 tags:
@@ -16,7 +16,7 @@
16 16
17- name: Setup repositories 17- name: Setup repositories
18 hosts: undercloud 18 hosts: undercloud
19 gather_facts: yes 19 gather_facts: true
20 roles: 20 roles:
21 - repo-setup 21 - repo-setup
22 tags: 22 tags:
@@ -24,7 +24,7 @@
24 24
25- name: Install packages 25- name: Install packages
26 hosts: undercloud 26 hosts: undercloud
27 gather_facts: no 27 gather_facts: false
28 roles: 28 roles:
29 - baremetal-undercloud/packages 29 - baremetal-undercloud/packages
30 tags: 30 tags:
@@ -32,7 +32,7 @@
32 32
33- name: Fetch the overcloud images 33- name: Fetch the overcloud images
34 hosts: undercloud 34 hosts: undercloud
35 gather_facts: no 35 gather_facts: false
36 roles: 36 roles:
37 - fetch-images 37 - fetch-images
38 tags: 38 tags:
diff --git a/playbooks/build-images-v2.yml b/playbooks/build-images-v2.yml
index 2a03bc5..11ecde5 100644
--- a/playbooks/build-images-v2.yml
+++ b/playbooks/build-images-v2.yml
@@ -13,9 +13,9 @@
13 tags: 13 tags:
14 - provision 14 - provision
15 15
16- name: Inventory the virthost 16- name: Inventory the virthost
17 hosts: localhost 17 hosts: localhost
18 gather_facts: yes 18 gather_facts: true
19 roles: 19 roles:
20 - tripleo-inventory 20 - tripleo-inventory
21 tags: 21 tags:
diff --git a/playbooks/build-test-packages.yml b/playbooks/build-test-packages.yml
index 5d9539b..72cf0f8 100644
--- a/playbooks/build-test-packages.yml
+++ b/playbooks/build-test-packages.yml
@@ -13,9 +13,9 @@
13 tags: 13 tags:
14 - provision 14 - provision
15 15
16- name: Inventory the virthost 16- name: Inventory the virthost
17 hosts: localhost 17 hosts: localhost
18 gather_facts: yes 18 gather_facts: true
19 roles: 19 roles:
20 - tripleo-inventory 20 - tripleo-inventory
21 tags: 21 tags:
diff --git a/playbooks/cleanup-destructive.yml b/playbooks/cleanup-destructive.yml
index 668b3d4..e0e7987 100644
--- a/playbooks/cleanup-destructive.yml
+++ b/playbooks/cleanup-destructive.yml
@@ -10,8 +10,8 @@
10 ansible_user: "root" 10 ansible_user: "root"
11 ansible_host: "{{ virthost }}" 11 ansible_host: "{{ virthost }}"
12 12
13- name: Clean up tripleo packages and libvirt 13- name: Clean up tripleo packages and libvirt
14 hosts: virthost 14 hosts: virthost
15 gather_facts: no 15 gather_facts: false
16 roles: 16 roles:
17 - virthost-full-cleanup 17 - virthost-full-cleanup
diff --git a/playbooks/collect-logs.yml b/playbooks/collect-logs.yml
index 4ed2e0c..880a8b9 100644
--- a/playbooks/collect-logs.yml
+++ b/playbooks/collect-logs.yml
@@ -6,14 +6,14 @@
6 6
7- name: Ensure the overcloud nodes are added to the generated inventory 7- name: Ensure the overcloud nodes are added to the generated inventory
8 hosts: undercloud 8 hosts: undercloud
9 gather_facts: yes 9 gather_facts: true
10 tags: 10 tags:
11 - collect-logs 11 - collect-logs
12 vars: 12 vars:
13 inventory: all 13 inventory: all
14 roles: 14 roles:
15 - tripleo-inventory 15 - tripleo-inventory
16 ignore_errors: yes 16 ignore_errors: true
17 17
18- name: Collect logs 18- name: Collect logs
19 hosts: all:!localhost:!127.0.0.2 19 hosts: all:!localhost:!127.0.0.2
@@ -23,4 +23,4 @@
23- name: Create docs, publish logs 23- name: Create docs, publish logs
24 hosts: localhost 24 hosts: localhost
25 roles: 25 roles:
26 - {role: collect-logs, artcl_collect: false } 26 - {role: collect-logs, artcl_collect: false}
diff --git a/playbooks/deploy-delete.yml b/playbooks/deploy-delete.yml
index 132d9fa..9471675 100644
--- a/playbooks/deploy-delete.yml
+++ b/playbooks/deploy-delete.yml
@@ -1,15 +1,16 @@
1---
1# This is the playbook used by the `quickstart.sh` script. 2# This is the playbook used by the `quickstart.sh` script.
2 3
3- include: quickstart-extras.yml 4- include: quickstart-extras.yml
4 5
5- name: Collect logs, create docs, publish 6- name: Collect logs, create docs, publish
6 hosts: all:!localhost 7 hosts: all:!localhost
7 gather_facts: no 8 gather_facts: false
8 roles: 9 roles:
9 - { role: tripleo-collect-logs, artcl_collect: true } 10 - {role: tripleo-collect-logs, artcl_collect: true}
10 11
11- name: test overcloud deletion 12- name: test overcloud deletion
12 hosts: undercloud 13 hosts: undercloud
13 gather_facts: no 14 gather_facts: false
14 roles: 15 roles:
15 - { role: overcloud-delete } 16 - {role: overcloud-delete}
diff --git a/playbooks/multinode-overcloud-prep.yml b/playbooks/multinode-overcloud-prep.yml
index ee0ecee..21408d9 100644
--- a/playbooks/multinode-overcloud-prep.yml
+++ b/playbooks/multinode-overcloud-prep.yml
@@ -1,7 +1,7 @@
1--- 1---
2- name: Run overcloud prep config 2- name: Run overcloud prep config
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: no 4 gather_facts: false
5 roles: 5 roles:
6 - role: overcloud-prep-config 6 - role: overcloud-prep-config
7 # only run when we know we have to, save time otherwise 7 # only run when we know we have to, save time otherwise
@@ -11,24 +11,27 @@
11 11
12- name: Run overcloud prep roles 12- name: Run overcloud prep roles
13 hosts: undercloud 13 hosts: undercloud
14 gather_facts: no 14 gather_facts: false
15 roles: 15 roles:
16 - { role: overcloud-prep-images, step_overcloud_image: false, step_glance_upload: true, step_register: false } 16 - {role: overcloud-prep-images,
17 step_overcloud_image: false,
18 step_glance_upload: true,
19 step_register: false}
17 20
18- name: Run tripleo-validations pre-introspection tests 21- name: Run tripleo-validations pre-introspection tests
19 hosts: undercloud 22 hosts: undercloud
20 gather_facts: no 23 gather_facts: false
21 tags: 24 tags:
22 - tripleo-validations 25 - tripleo-validations
23 vars: 26 vars:
24 validations_group: ['pre-introspection'] 27 validations_group: ['pre-introspection']
25 roles: 28 roles:
26 - { role: tripleo-validations, 29 - {role: tripleo-validations,
27 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 30 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
28 31
29- name: Prepare for containerized deployment 32- name: Prepare for containerized deployment
30 hosts: undercloud 33 hosts: undercloud
31 gather_facts: no 34 gather_facts: false
32 tags: 35 tags:
33 - overcloud-prep-containers 36 - overcloud-prep-containers
34 roles: 37 roles:
@@ -38,11 +41,11 @@
38 41
39- name: Run tripleo-validations pre-deployment tests 42- name: Run tripleo-validations pre-deployment tests
40 hosts: undercloud 43 hosts: undercloud
41 gather_facts: no 44 gather_facts: false
42 tags: 45 tags:
43 - tripleo-validations 46 - tripleo-validations
44 vars: 47 vars:
45 validations_group: ['pre-deployment'] 48 validations_group: ['pre-deployment']
46 roles: 49 roles:
47 - { role: tripleo-validations, 50 - {role: tripleo-validations,
48 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 51 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
diff --git a/playbooks/multinode-overcloud-update.yml b/playbooks/multinode-overcloud-update.yml
index 718eba8..af04fbc 100644
--- a/playbooks/multinode-overcloud-update.yml
+++ b/playbooks/multinode-overcloud-update.yml
@@ -1,6 +1,7 @@
1---
1- name: Run tripleo-upgrade role to update the overcloud 2- name: Run tripleo-upgrade role to update the overcloud
2 hosts: undercloud 3 hosts: undercloud
3 gather_facts: yes 4 gather_facts: true
4 tags: 5 tags:
5 - overcloud-update 6 - overcloud-update
6 roles: 7 roles:
diff --git a/playbooks/multinode-overcloud-upgrade.yml b/playbooks/multinode-overcloud-upgrade.yml
index e04084b..5d429ee 100644
--- a/playbooks/multinode-overcloud-upgrade.yml
+++ b/playbooks/multinode-overcloud-upgrade.yml
@@ -1,8 +1,9 @@
1---
1- name: Generate repo-setup script for overcloud upgrade 2- name: Generate repo-setup script for overcloud upgrade
2 hosts: undercloud 3 hosts: undercloud
3 tags: 4 tags:
4 - overcloud-upgrade 5 - overcloud-upgrade
5 gather_facts: no 6 gather_facts: false
6 vars: 7 vars:
7 repo_run_live: false 8 repo_run_live: false
8 repo_setup_script: "repo-setup-{{ target_upgrade_version }}.sh" 9 repo_setup_script: "repo-setup-{{ target_upgrade_version }}.sh"
@@ -18,7 +19,7 @@
18 19
19- name: Prepare containers for Upgrade 20- name: Prepare containers for Upgrade
20 hosts: undercloud 21 hosts: undercloud
21 gather_facts: no 22 gather_facts: false
22 tags: 23 tags:
23 - overcloud-prep-containers 24 - overcloud-prep-containers
24 roles: 25 roles:
@@ -35,7 +36,7 @@
35 36
36- name: Run tripleo-upgrade role to upgrade overcloud 37- name: Run tripleo-upgrade role to upgrade overcloud
37 hosts: undercloud 38 hosts: undercloud
38 gather_facts: yes 39 gather_facts: true
39 tags: 40 tags:
40 - overcloud-upgrade 41 - overcloud-upgrade
41 vars: 42 vars:
diff --git a/playbooks/multinode-overcloud.yml b/playbooks/multinode-overcloud.yml
index 796ade9..24e69f5 100644
--- a/playbooks/multinode-overcloud.yml
+++ b/playbooks/multinode-overcloud.yml
@@ -1,7 +1,7 @@
1--- 1---
2- name: Deploy the overcloud 2- name: Deploy the overcloud
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: no 4 gather_facts: false
5 roles: 5 roles:
6 - overcloud-deploy 6 - overcloud-deploy
7 environment: 7 environment:
@@ -22,12 +22,11 @@
22 22
23- name: Run tripleo-validations post-deployment tests 23- name: Run tripleo-validations post-deployment tests
24 hosts: undercloud 24 hosts: undercloud
25 gather_facts: no 25 gather_facts: false
26 tags: 26 tags:
27 - tripleo-validations 27 - tripleo-validations
28 vars: 28 vars:
29 validations_group: ['post-deployment'] 29 validations_group: ['post-deployment']
30 roles: 30 roles:
31 - { role: tripleo-validations, 31 - {role: tripleo-validations,
32 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 32 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
33
diff --git a/playbooks/multinode-standalone-upgrade.yml b/playbooks/multinode-standalone-upgrade.yml
index 75cf7b0..9846e7c 100644
--- a/playbooks/multinode-standalone-upgrade.yml
+++ b/playbooks/multinode-standalone-upgrade.yml
@@ -41,7 +41,7 @@
41 artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz" 41 artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
42 roles: 42 roles:
43 - build-test-packages 43 - build-test-packages
44 - { role: install-built-repo, when: compressed_gating_repo is defined } 44 - {role: install-built-repo, when: compressed_gating_repo is defined}
45 tags: 45 tags:
46 - standalone-upgrade 46 - standalone-upgrade
47 47
@@ -56,8 +56,8 @@
56 56
57- name: Validate the Standalone upgrade 57- name: Validate the Standalone upgrade
58 hosts: undercloud 58 hosts: undercloud
59 gather_facts: no 59 gather_facts: false
60 roles: 60 roles:
61 - { role: validate-tempest, when: run_tempest|bool } 61 - {role: validate-tempest, when: run_tempest|bool}
62 tags: 62 tags:
63 - standalone-upgrade 63 - standalone-upgrade
diff --git a/playbooks/multinode-standalone.yml b/playbooks/multinode-standalone.yml
index 0b156dd..977e5ea 100644
--- a/playbooks/multinode-standalone.yml
+++ b/playbooks/multinode-standalone.yml
@@ -1,7 +1,7 @@
1--- 1---
2- name: Add the overcloud nodes to the generated inventory 2- name: Add the overcloud nodes to the generated inventory
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: yes 4 gather_facts: true
5 tags: 5 tags:
6 - standalone 6 - standalone
7 vars: 7 vars:
@@ -22,7 +22,7 @@
22 artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz" 22 artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
23 roles: 23 roles:
24 - build-test-packages 24 - build-test-packages
25 - { role: install-built-repo, when: compressed_gating_repo is defined } 25 - {role: install-built-repo, when: compressed_gating_repo is defined}
26 tags: 26 tags:
27 - build 27 - build
28 28
@@ -44,8 +44,8 @@
44 44
45- name: Validate the undercloud 45- name: Validate the undercloud
46 hosts: undercloud 46 hosts: undercloud
47 gather_facts: no 47 gather_facts: false
48 roles: 48 roles:
49 - { role: validate-tempest, when: run_tempest|bool } 49 - {role: validate-tempest, when: run_tempest|bool}
50 tags: 50 tags:
51 - standalone 51 - standalone
diff --git a/playbooks/multinode-undercloud.yml b/playbooks/multinode-undercloud.yml
index 8738dd6..61519de 100644
--- a/playbooks/multinode-undercloud.yml
+++ b/playbooks/multinode-undercloud.yml
@@ -1,7 +1,7 @@
1--- 1---
2- name: Add the overcloud nodes to the generated inventory 2- name: Add the overcloud nodes to the generated inventory
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: yes 4 gather_facts: true
5 tags: 5 tags:
6 - overcloud-deploy 6 - overcloud-deploy
7 vars: 7 vars:
@@ -47,7 +47,7 @@
47 artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz" 47 artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
48 roles: 48 roles:
49 - build-test-packages 49 - build-test-packages
50 - { role: install-built-repo, when: compressed_gating_repo is defined } 50 - {role: install-built-repo, when: compressed_gating_repo is defined}
51 tags: 51 tags:
52 - build 52 - build
53 53
@@ -71,14 +71,14 @@
71 71
72- name: Configure tripleo-validations 72- name: Configure tripleo-validations
73 hosts: undercloud 73 hosts: undercloud
74 gather_facts: no 74 gather_facts: false
75 tags: 75 tags:
76 - tripleo-validations 76 - tripleo-validations
77 vars: 77 vars:
78 run_tripleo_validations_setup: True 78 run_tripleo_validations_setup: true
79 roles: 79 roles:
80 - { role: tripleo-validations, 80 - {role: tripleo-validations,
81 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 81 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
82 82
83- name: Validate the undercloud 83- name: Validate the undercloud
84 hosts: undercloud 84 hosts: undercloud
diff --git a/playbooks/multinode-validate.yml b/playbooks/multinode-validate.yml
index 24ca955..9eee46d 100644
--- a/playbooks/multinode-validate.yml
+++ b/playbooks/multinode-validate.yml
@@ -4,17 +4,17 @@
4 tags: 4 tags:
5 - overcloud-validate 5 - overcloud-validate
6 roles: 6 roles:
7 - { role: validate-perf, 7 - {role: validate-perf,
8 when: validate_performance|bool and run_tempest|bool } 8 when: validate_performance|bool and run_tempest|bool}
9 ignore_errors: true 9 ignore_errors: true
10 10
11# Validate the deployment 11# Validate the deployment
12- name: validate the overcloud 12- name: validate the overcloud
13 hosts: undercloud 13 hosts: undercloud
14 tags: 14 tags:
15 - overcloud-validate 15 - overcloud-validate
16 - undercloud-validate 16 - undercloud-validate
17 gather_facts: no 17 gather_facts: false
18 roles: 18 roles:
19 - { role: validate-simple, when: test_ping|bool } 19 - {role: validate-simple, when: test_ping|bool}
20 - { role: validate-tempest, when: run_tempest|bool } 20 - {role: validate-tempest, when: run_tempest|bool}
diff --git a/playbooks/nodepool-setup.yml b/playbooks/nodepool-setup.yml
index e352053..be8efdf 100644
--- a/playbooks/nodepool-setup.yml
+++ b/playbooks/nodepool-setup.yml
@@ -1,7 +1,7 @@
1---
1# setup the nodepool nodes 2# setup the nodepool nodes
2- name: Setup the provisioned virtual machines to look like nodepool nodes 3- name: Setup the provisioned virtual machines to look like nodepool nodes
3 hosts: subnodes 4 hosts: subnodes
4 gather_facts: yes 5 gather_facts: true
5 roles: 6 roles:
6 - nodepool-setup 7 - nodepool-setup
7
diff --git a/playbooks/ovb-setup.yml b/playbooks/ovb-setup.yml
index 6af91ca..efc411a 100644
--- a/playbooks/ovb-setup.yml
+++ b/playbooks/ovb-setup.yml
@@ -5,28 +5,28 @@
5- include: prepare-slave.yml 5- include: prepare-slave.yml
6 when: use_testenv_broker|default(false)|bool 6 when: use_testenv_broker|default(false)|bool
7 7
8- name: Inventory the undercloud instance 8- name: Inventory the undercloud instance
9 hosts: localhost 9 hosts: localhost
10 gather_facts: yes 10 gather_facts: true
11 roles: 11 roles:
12 - tripleo-inventory 12 - tripleo-inventory
13 13
14- name: Setup the undercloud 14- name: Setup the undercloud
15 hosts: undercloud 15 hosts: undercloud
16 gather_facts: yes 16 gather_facts: true
17 roles: 17 roles:
18 - undercloud-setup 18 - undercloud-setup
19 tasks: 19 tasks:
20 - name: Add eth2 interface from eth2.conf 20 - name: Add eth2 interface from eth2.conf
21 command: os-net-config -c {{ working_dir }}/eth2.conf -v 21 command: os-net-config -c {{ working_dir }}/eth2.conf -v
22 become: yes 22 become: true
23 when: 23 when:
24 - network_isolation|bool 24 - network_isolation|bool
25 - use_testenv_broker|default(false)|bool 25 - use_testenv_broker|default(false)|bool
26 26
27- name: Inventory the undercloud instance 27- name: Inventory the undercloud instance
28 hosts: localhost 28 hosts: localhost
29 gather_facts: yes 29 gather_facts: true
30 roles: 30 roles:
31 - tripleo-inventory 31 - tripleo-inventory
32 32
@@ -42,14 +42,14 @@
42 artg_repos_dir: "{{ repo_clone_dir|default('/opt/stack/new') }}" 42 artg_repos_dir: "{{ repo_clone_dir|default('/opt/stack/new') }}"
43 ib_create_web_repo: "{{ to_build|bool }}" 43 ib_create_web_repo: "{{ to_build|bool }}"
44 roles: 44 roles:
45 - { role: build-test-packages, when: build_test_packages|default(false)|bool } 45 - {role: build-test-packages, when: build_test_packages|default(false)|bool}
46 - { role: install-built-repo, when: compressed_gating_repo is defined } 46 - {role: install-built-repo, when: compressed_gating_repo is defined}
47 tags: 47 tags:
48 - build 48 - build
49 49
50- name: Get images for quickstart 50- name: Get images for quickstart
51 hosts: undercloud 51 hosts: undercloud
52 gather_facts: no 52 gather_facts: false
53 vars: 53 vars:
54 ib_repo_image_inject: "{{ not to_build|bool }}" 54 ib_repo_image_inject: "{{ not to_build|bool }}"
55 ib_repo_run_live: false 55 ib_repo_run_live: false
@@ -57,9 +57,23 @@
57 modify_image_vc_cpu: 4 57 modify_image_vc_cpu: 4
58 modify_image_vc_verbose: true 58 modify_image_vc_verbose: true
59 roles: 59 roles:
60 - { role: fetch-images, when: not to_build|bool } 60 - {role: fetch-images,
61 - { role: repo-setup, repo_inject_image_path: "$HOME/overcloud-full.qcow2", repo_run_live: false, when: not to_build|bool } 61 when: not to_build|bool}
62 - { role: repo-setup, repo_inject_image_path: "$HOME/ironic-python-agent.initramfs", repo_run_live: false, initramfs_image: true, libguestfs_mode: false, when: not to_build|bool } 62 - {role: repo-setup,
63 - { role: install-built-repo, ib_repo_image_path: "$HOME/overcloud-full.qcow2", when: compressed_gating_repo is defined and not to_build|bool } 63 repo_inject_image_path: "$HOME/overcloud-full.qcow2",
64 - { role: install-built-repo, ib_repo_image_path: "$HOME/ironic-python-agent.initramfs", initramfs_image: true, libguestfs_mode: false, when: compressed_gating_repo is defined and not to_build|bool } 64 repo_run_live: false,
65 65 when: not to_build|bool}
66 - {role: repo-setup,
67 repo_inject_image_path: "$HOME/ironic-python-agent.initramfs",
68 repo_run_live: false,
69 initramfs_image: true,
70 libguestfs_mode: false,
71 when: not to_build|bool}
72 - {role: install-built-repo,
73 ib_repo_image_path: "$HOME/overcloud-full.qcow2",
74 when: compressed_gating_repo is defined and not to_build|bool}
75 - {role: install-built-repo,
76 ib_repo_image_path: "$HOME/ironic-python-agent.initramfs",
77 initramfs_image: true,
78 libguestfs_mode: false,
79 when: compressed_gating_repo is defined and not to_build|bool}
diff --git a/playbooks/provision_multinodes.yml b/playbooks/provision_multinodes.yml
index 27c7c51..792ddae 100644
--- a/playbooks/provision_multinodes.yml
+++ b/playbooks/provision_multinodes.yml
@@ -1,6 +1,6 @@
1--- 1---
2- name: Multinode 2- name: Multinode
3 hosts: localhost 3 hosts: localhost
4 gather_facts: no 4 gather_facts: false
5 roles: 5 roles:
6 - role: multinodes 6 - role: multinodes
diff --git a/playbooks/quickstart-extras-overcloud-prep.yml b/playbooks/quickstart-extras-overcloud-prep.yml
index 4233e87..4cb73e9 100644
--- a/playbooks/quickstart-extras-overcloud-prep.yml
+++ b/playbooks/quickstart-extras-overcloud-prep.yml
@@ -1,25 +1,26 @@
1---
1# Prepare any additional configuration files required by the overcloud 2# Prepare any additional configuration files required by the overcloud
2- name: Prepare configuration files for the overcloud deployment 3- name: Prepare configuration files for the overcloud deployment
3 hosts: undercloud 4 hosts: undercloud
4 gather_facts: no 5 gather_facts: false
5 tags: 6 tags:
6 - overcloud-prep-config 7 - overcloud-prep-config
7 roles: 8 roles:
8 - overcloud-prep-config 9 - overcloud-prep-config
9 10
10# Prepare the overcloud for a containerized deployment 11# Prepare the overcloud for a containerized deployment
11- name: Prepare overcloud containers 12- name: Prepare overcloud containers
12 hosts: undercloud 13 hosts: undercloud
13 gather_facts: no 14 gather_facts: false
14 tags: 15 tags:
15 - overcloud-prep-containers 16 - overcloud-prep-containers
16 roles: 17 roles:
17 - overcloud-prep-containers 18 - overcloud-prep-containers
18 19
19# Prepare the overcloud images for deployment 20# Prepare the overcloud images for deployment
20- name: Prepare the overcloud images for deployment 21- name: Prepare the overcloud images for deployment
21 hosts: undercloud 22 hosts: undercloud
22 gather_facts: no 23 gather_facts: false
23 tags: 24 tags:
24 - overcloud-prep-images 25 - overcloud-prep-images
25 roles: 26 roles:
@@ -27,28 +28,28 @@
27 28
28- name: Run tripleo-validations pre-introspection tests 29- name: Run tripleo-validations pre-introspection tests
29 hosts: undercloud 30 hosts: undercloud
30 gather_facts: no 31 gather_facts: false
31 tags: 32 tags:
32 - tripleo-validations 33 - tripleo-validations
33 vars: 34 vars:
34 validations_group: ['pre-introspection'] 35 validations_group: ['pre-introspection']
35 roles: 36 roles:
36 - { role: tripleo-validations, 37 - {role: tripleo-validations,
37 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 38 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
38 39
39# Prepare the overcloud flavor configuration 40# Prepare the overcloud flavor configuration
40- name: Prepare overcloud flavors 41- name: Prepare overcloud flavors
41 hosts: undercloud 42 hosts: undercloud
42 gather_facts: no 43 gather_facts: false
43 tags: 44 tags:
44 - overcloud-prep-flavors 45 - overcloud-prep-flavors
45 roles: 46 roles:
46 - overcloud-prep-flavors 47 - overcloud-prep-flavors
47 48
48# Prepare the undercloud networks for the overcloud deployment 49# Prepare the undercloud networks for the overcloud deployment
49- name: Prepare the undercloud networks for the overcloud deployment 50- name: Prepare the undercloud networks for the overcloud deployment
50 hosts: undercloud 51 hosts: undercloud
51 gather_facts: no 52 gather_facts: false
52 tags: 53 tags:
53 - overcloud-prep-network 54 - overcloud-prep-network
54 roles: 55 roles:
@@ -56,20 +57,20 @@
56 57
57- name: Run tripleo-validations pre-deployment tests 58- name: Run tripleo-validations pre-deployment tests
58 hosts: undercloud 59 hosts: undercloud
59 gather_facts: no 60 gather_facts: false
60 tags: 61 tags:
61 - tripleo-validations 62 - tripleo-validations
62 vars: 63 vars:
63 validations_group: ['pre-deployment'] 64 validations_group: ['pre-deployment']
64 roles: 65 roles:
65 - { role: tripleo-validations, 66 - {role: tripleo-validations,
66 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 67 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
67 68
68- name: Prepare the SSL Configuration for the overcloud deployment 69- name: Prepare the SSL Configuration for the overcloud deployment
69 hosts: undercloud 70 hosts: undercloud
70 gather_facts: no 71 gather_facts: false
71 tags: 72 tags:
72 - overcloud-scripts 73 - overcloud-scripts
73 - overcloud-ssl 74 - overcloud-ssl
74 roles: 75 roles:
75 - { role: overcloud-ssl } 76 - {role: overcloud-ssl}
diff --git a/playbooks/quickstart-extras-overcloud.yml b/playbooks/quickstart-extras-overcloud.yml
index 24144c1..7bf6f5c 100644
--- a/playbooks/quickstart-extras-overcloud.yml
+++ b/playbooks/quickstart-extras-overcloud.yml
@@ -1,7 +1,8 @@
1---
1# Deploy the overcloud 2# Deploy the overcloud
2- name: Deploy the overcloud 3- name: Deploy the overcloud
3 hosts: undercloud 4 hosts: undercloud
4 gather_facts: yes 5 gather_facts: true
5 tags: 6 tags:
6 - overcloud-deploy 7 - overcloud-deploy
7 roles: 8 roles:
@@ -9,28 +10,28 @@
9 10
10- name: Add the overcloud nodes to the generated inventory 11- name: Add the overcloud nodes to the generated inventory
11 hosts: undercloud 12 hosts: undercloud
12 gather_facts: yes 13 gather_facts: true
13 tags: 14 tags:
14 - overcloud-deploy 15 - overcloud-deploy
15 - overcloud-inventory 16 - overcloud-inventory
16 vars: 17 vars:
17 inventory: all 18 inventory: all
18 roles: 19 roles:
19 - tripleo-inventory 20 - tripleo-inventory
20 21
21- name: Run tripleo-validations post-deployment tests 22- name: Run tripleo-validations post-deployment tests
22 hosts: undercloud 23 hosts: undercloud
23 gather_facts: no 24 gather_facts: false
24 tags: 25 tags:
25 - tripleo-validations 26 - tripleo-validations
26 vars: 27 vars:
27 validations_group: ['post-deployment'] 28 validations_group: ['post-deployment']
28 roles: 29 roles:
29 - { role: tripleo-validations, 30 - {role: tripleo-validations,
30 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 31 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
31 32
32# Check the results of the deployment, note after inventory has executed 33# Check the results of the deployment, note after inventory has executed
33- name: Check the result of the deployment 34- name: Check the result of the deployment
34 hosts: localhost 35 hosts: localhost
35 tags: 36 tags:
36 - overcloud-deploy 37 - overcloud-deploy
diff --git a/playbooks/quickstart-extras-undercloud.yml b/playbooks/quickstart-extras-undercloud.yml
index 9e06101..47e5c7a 100644
--- a/playbooks/quickstart-extras-undercloud.yml
+++ b/playbooks/quickstart-extras-undercloud.yml
@@ -1,27 +1,28 @@
1---
1# Deploy the FreeIPA server 2# Deploy the FreeIPA server
2- name: Deploy the FreeIPA server 3- name: Deploy the FreeIPA server
3 hosts: supplemental 4 hosts: supplemental
4 gather_facts: no 5 gather_facts: false
5 tags: 6 tags:
6 - freeipa-setup 7 - freeipa-setup
7 roles: 8 roles:
8 - { role: freeipa-setup, when: deploy_supplemental_node|bool and enable_tls_everywhere|bool } 9 - {role: freeipa-setup, when: deploy_supplemental_node|bool and enable_tls_everywhere|bool}
9 10
10# setup for the undercloud 11# setup for the undercloud
11- name: Setup the undercloud 12- name: Setup the undercloud
12 hosts: undercloud 13 hosts: undercloud
13 gather_facts: no 14 gather_facts: false
14 vars: 15 vars:
15 ansible_user: root 16 ansible_user: root
16 tags: 17 tags:
17 - undercloud-setup 18 - undercloud-setup
18 roles: 19 roles:
19 - { role: undercloud-setup, when: undercloud_setup|bool } 20 - {role: undercloud-setup, when: undercloud_setup|bool}
20 21
21# Deploy the undercloud 22# Deploy the undercloud
22- name: Deploy the undercloud 23- name: Deploy the undercloud
23 hosts: undercloud 24 hosts: undercloud
24 gather_facts: no 25 gather_facts: false
25 tags: 26 tags:
26 - undercloud-deploy 27 - undercloud-deploy
27 roles: 28 roles:
@@ -29,12 +30,11 @@
29 30
30- name: Configure tripleo-validations 31- name: Configure tripleo-validations
31 hosts: undercloud 32 hosts: undercloud
32 gather_facts: no 33 gather_facts: false
33 tags: 34 tags:
34 - tripleo-validations 35 - tripleo-validations
35 vars: 36 vars:
36 run_tripleo_validations_setup: True 37 run_tripleo_validations_setup: true
37 roles: 38 roles:
38 - { role: tripleo-validations, 39 - {role: tripleo-validations,
39 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 40 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
40
diff --git a/playbooks/quickstart-extras-validate.yml b/playbooks/quickstart-extras-validate.yml
index 8dd6497..70d5dee 100644
--- a/playbooks/quickstart-extras-validate.yml
+++ b/playbooks/quickstart-extras-validate.yml
@@ -1,35 +1,36 @@
1---
1# Validate the deployment 2# Validate the deployment
2- name: setup dstat performance monitoring 3- name: setup dstat performance monitoring
3 hosts: overcloud 4 hosts: overcloud
4 tags: 5 tags:
5 - overcloud-validate 6 - overcloud-validate
6 roles: 7 roles:
7 - { role: validate-perf, 8 - {role: validate-perf,
8 when: validate_performance|bool and run_tempest|bool } 9 when: validate_performance|bool and run_tempest|bool}
9 ignore_errors: true 10 ignore_errors: true
10 11
11- name: validate the overcloud 12- name: validate the overcloud
12 hosts: undercloud 13 hosts: undercloud
13 tags: 14 tags:
14 - overcloud-validate 15 - overcloud-validate
15 gather_facts: no 16 gather_facts: false
16 roles: 17 roles:
17 - { role: validate-simple, when: test_ping|bool } 18 - {role: validate-simple, when: test_ping|bool}
18 19
19# Execute tempest against the overcloud deployment 20# Execute tempest against the overcloud deployment
20- name: Execute tempest against the overcloud 21- name: Execute tempest against the overcloud
21 hosts: undercloud 22 hosts: undercloud
22 tags: 23 tags:
23 - overcloud-validate 24 - overcloud-validate
24 gather_facts: no 25 gather_facts: false
25 roles: 26 roles:
26 - { role: validate-tempest, when: tempest_config|bool or run_tempest|bool } 27 - {role: validate-tempest, when: tempest_config|bool or run_tempest|bool}
27 28
28# Execute simple TripleO-UI validations 29# Execute simple TripleO-UI validations
29- name: Execute simple TripleO-UI validations 30- name: Execute simple TripleO-UI validations
30 hosts: localhost 31 hosts: localhost
31 tags: 32 tags:
32 - tripleoui-validate 33 - tripleoui-validate
33 gather_facts: yes 34 gather_facts: true
34 roles: 35 roles:
35 - { role: validate-ui, when: validate_ui_simple|bool and undercloud_enable_ui|default(true)|bool } 36 - {role: validate-ui, when: validate_ui_simple|bool and undercloud_enable_ui|default(true)|bool}
diff --git a/playbooks/repo-setup.yml b/playbooks/repo-setup.yml
index a71080b..5a3d9c9 100644
--- a/playbooks/repo-setup.yml
+++ b/playbooks/repo-setup.yml
@@ -1,6 +1,6 @@
1--- 1---
2- name: Setup repositories 2- name: Setup repositories
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: yes 4 gather_facts: true
5 roles: 5 roles:
6 - repo-setup 6 - repo-setup
diff --git a/playbooks/scale_nodes_verify.yml b/playbooks/scale_nodes_verify.yml
index 2f9f909..9d422e7 100644
--- a/playbooks/scale_nodes_verify.yml
+++ b/playbooks/scale_nodes_verify.yml
@@ -7,7 +7,7 @@
7# Re-inventory the overcloud 7# Re-inventory the overcloud
8- name: Inventory the overcloud 8- name: Inventory the overcloud
9 hosts: undercloud 9 hosts: undercloud
10 gather_facts: yes 10 gather_facts: true
11 vars: 11 vars:
12 inventory: all 12 inventory: all
13 roles: 13 roles:
@@ -16,6 +16,6 @@
16# Validate the overcloud 16# Validate the overcloud
17- name: Validate the overcloud post-delete-node 17- name: Validate the overcloud post-delete-node
18 hosts: undercloud 18 hosts: undercloud
19 gather_facts: no 19 gather_facts: false
20 roles: 20 roles:
21 - validate-simple 21 - validate-simple
diff --git a/playbooks/snapshot-libvirt.yml b/playbooks/snapshot-libvirt.yml
index a305c06..efcc103 100644
--- a/playbooks/snapshot-libvirt.yml
+++ b/playbooks/snapshot-libvirt.yml
@@ -1,13 +1,12 @@
1--- 1---
2- name: Snapshot virts 2- name: Snapshot virts
3 hosts: virthost 3 hosts: virthost
4 gather_facts: yes 4 gather_facts: true
5 vars: 5 vars:
6 - libvirt_uri: qemu:///system 6 - libvirt_uri: qemu:///system
7 - overcloud_nodes: 7 - overcloud_nodes:
8 - name: subnode-0 8 - name: subnode-0
9 - name: subnode-1 9 - name: subnode-1
10 roles: 10 roles:
11 - snapshot-libvirt 11 - snapshot-libvirt
12 become: true 12 become: true
13
diff --git a/playbooks/tempest.yml b/playbooks/tempest.yml
index 6909055..20eb4e1 100644
--- a/playbooks/tempest.yml
+++ b/playbooks/tempest.yml
@@ -1,6 +1,6 @@
1--- 1---
2- name: Run tempest 2- name: Run tempest
3 hosts: undercloud 3 hosts: undercloud
4 gather_facts: no 4 gather_facts: false
5 roles: 5 roles:
6 - validate-tempest 6 - validate-tempest
diff --git a/playbooks/tripleo-validations.yml b/playbooks/tripleo-validations.yml
index 1bebc99..5f4b70a 100644
--- a/playbooks/tripleo-validations.yml
+++ b/playbooks/tripleo-validations.yml
@@ -2,23 +2,22 @@
2 2
3- name: Configure tripleo-validations 3- name: Configure tripleo-validations
4 hosts: undercloud 4 hosts: undercloud
5 gather_facts: no 5 gather_facts: false
6 tags: 6 tags:
7 - tripleo-validations 7 - tripleo-validations
8 vars: 8 vars:
9 run_tripleo_validations_setup: True 9 run_tripleo_validations_setup: true
10 roles: 10 roles:
11 - { role: tripleo-validations, 11 - {role: tripleo-validations,
12 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 12 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
13 13
14- name: Run tripleo-validations pre-introspection tests 14- name: Run tripleo-validations pre-introspection tests
15 hosts: undercloud 15 hosts: undercloud
16 gather_facts: no 16 gather_facts: false
17 tags: 17 tags:
18 - tripleo-validations 18 - tripleo-validations
19 vars: 19 vars:
20 validations_group: ['pre-introspection'] 20 validations_group: ['pre-introspection']
21 roles: 21 roles:
22 - { role: tripleo-validations, 22 - {role: tripleo-validations,
23 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool} 23 when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
24
diff --git a/roles/baremetal-prep-overcloud/README.md b/roles/baremetal-prep-overcloud/README.md
index b1c6f49..05dbbcf 100644
--- a/roles/baremetal-prep-overcloud/README.md
+++ b/roles/baremetal-prep-overcloud/README.md
@@ -34,7 +34,7 @@ Example Playbook
34 34
35 - name: Prepare for deployment on baremetal overcloud 35 - name: Prepare for deployment on baremetal overcloud
36 hosts: virthost 36 hosts: virthost
37 gather_facts: no 37 gather_facts: false
38 roles: 38 roles:
39 - ansible-role-tripleo-overcloud-prep-baremetal 39 - ansible-role-tripleo-overcloud-prep-baremetal
40 40
diff --git a/roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml b/roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml
index c5e4f1e..bafff96 100644
--- a/roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml
+++ b/roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml
@@ -7,9 +7,7 @@
7 mode: 0755 7 mode: 0755
8 8
9- name: Adjust MTU values and modify dnsmasq-ironic.conf 9- name: Adjust MTU values and modify dnsmasq-ironic.conf
10 become: yes 10 become: true
11 shell: > 11 shell: >
12 "{{ working_dir }}"/adjust-interface-mtus.sh 12 "{{ working_dir }}"/adjust-interface-mtus.sh
13 when: step_adjust_mtu|bool 13 when: step_adjust_mtu|bool
14
15
diff --git a/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml b/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml
index de60019..606911d 100644
--- a/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml
+++ b/roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml
@@ -7,7 +7,7 @@
7 mode: 0755 7 mode: 0755
8 8
9- name: Allow traffic for the controller 9- name: Allow traffic for the controller
10 become: yes 10 become: true
11 shell: > 11 shell: >
12 "{{ working_dir }}"/allow-traffic-for-controller.sh 12 "{{ working_dir }}"/allow-traffic-for-controller.sh
13 when: 13 when:
diff --git a/roles/baremetal-prep-virthost/README.md b/roles/baremetal-prep-virthost/README.md
index a40cfd8..b9bc2f7 100644
--- a/roles/baremetal-prep-virthost/README.md
+++ b/roles/baremetal-prep-virthost/README.md
@@ -32,7 +32,7 @@ Example Playbook
32 32
33 - name: Prepare the host for PXE forwarding 33 - name: Prepare the host for PXE forwarding
34 hosts: virthost 34 hosts: virthost
35 gather_facts: no 35 gather_facts: false
36 roles: 36 roles:
37 - ansible-role-tripleo-baremetal-prep-virthost 37 - ansible-role-tripleo-baremetal-prep-virthost
38 38
diff --git a/roles/baremetal-prep-virthost/tasks/main.yml b/roles/baremetal-prep-virthost/tasks/main.yml
index a63ccd4..e6c6ea3 100644
--- a/roles/baremetal-prep-virthost/tasks/main.yml
+++ b/roles/baremetal-prep-virthost/tasks/main.yml
@@ -9,6 +9,6 @@
9 wait_for: path="{{ working_dir }}/add-provisioning-interface.sh" 9 wait_for: path="{{ working_dir }}/add-provisioning-interface.sh"
10 10
11- name: Add provisioning interface to the "brovc" bridge 11- name: Add provisioning interface to the "brovc" bridge
12 become: yes 12 become: true
13 shell: > 13 shell: >
14 "{{ working_dir }}"/add-provisioning-interface.sh 14 "{{ working_dir }}"/add-provisioning-interface.sh
diff --git a/roles/baremetal-undercloud/README.md b/roles/baremetal-undercloud/README.md
index 176b521..71a8e0c 100644
--- a/roles/baremetal-undercloud/README.md
+++ b/roles/baremetal-undercloud/README.md
@@ -219,7 +219,7 @@ others coming from various related to tripleo-quickstart:
219# Machine at this point is provided 219# Machine at this point is provided
220- name: Add the undercloud node to the generated inventory 220- name: Add the undercloud node to the generated inventory
221 hosts: localhost 221 hosts: localhost
222 gather_facts: yes 222 gather_facts: true
223 roles: 223 roles:
224 - tripleo-inventory 224 - tripleo-inventory
225 tags: 225 tags:
@@ -228,7 +228,7 @@ others coming from various related to tripleo-quickstart:
228# Deploy the undercloud 228# Deploy the undercloud
229- name: Install undercloud 229- name: Install undercloud
230 hosts: undercloud 230 hosts: undercloud
231 gather_facts: no 231 gather_facts: false
232 roles: 232 roles:
233 - tripleo/undercloud 233 - tripleo/undercloud
234 tags: 234 tags:
@@ -245,7 +245,7 @@ others coming from various related to tripleo-quickstart:
245# Prepare any additional configuration files required by the overcloud 245# Prepare any additional configuration files required by the overcloud
246- name: Prepare configuration files for the overcloud deployment 246- name: Prepare configuration files for the overcloud deployment
247 hosts: undercloud 247 hosts: undercloud
248 gather_facts: no 248 gather_facts: false
249 roles: 249 roles:
250 - overcloud-prep-config 250 - overcloud-prep-config
251 tags: 251 tags:
@@ -254,7 +254,7 @@ others coming from various related to tripleo-quickstart:
254# Prepare the overcloud images for deployment 254# Prepare the overcloud images for deployment
255- name: Prepare the overcloud images for deployment 255- name: Prepare the overcloud images for deployment
256 hosts: undercloud 256 hosts: undercloud
257 gather_facts: no 257 gather_facts: false
258 roles: 258 roles:
259 - overcloud-prep-images 259 - overcloud-prep-images
260 tags: 260 tags:
@@ -263,7 +263,7 @@ others coming from various related to tripleo-quickstart:
263# Prepare the overcloud flavor configuration 263# Prepare the overcloud flavor configuration
264- name: Prepare overcloud flavors 264- name: Prepare overcloud flavors
265 hosts: undercloud 265 hosts: undercloud
266 gather_facts: no 266 gather_facts: false
267 roles: 267 roles:
268 - overcloud-prep-flavors 268 - overcloud-prep-flavors
269 tags: 269 tags:
@@ -272,7 +272,7 @@ others coming from various related to tripleo-quickstart:
272# Prepare the undercloud networks for the overcloud deployment 272# Prepare the undercloud networks for the overcloud deployment
273- name: Prepare the undercloud networks for the overcloud deployment 273- name: Prepare the undercloud networks for the overcloud deployment
274 hosts: undercloud 274 hosts: undercloud
275 gather_facts: no 275 gather_facts: false
276 roles: 276 roles:
277 - overcloud-prep-network 277 - overcloud-prep-network
278 tags: 278 tags:
@@ -281,7 +281,7 @@ others coming from various related to tripleo-quickstart:
281# Deploy the overcloud 281# Deploy the overcloud
282- name: Deploy the overcloud 282- name: Deploy the overcloud
283 hosts: undercloud 283 hosts: undercloud
284 gather_facts: yes 284 gather_facts: true
285 roles: 285 roles:
286 - overcloud-deploy 286 - overcloud-deploy
287 tags: 287 tags:
@@ -289,7 +289,7 @@ others coming from various related to tripleo-quickstart:
289 289
290- name: Add the overcloud nodes to the generated inventory 290- name: Add the overcloud nodes to the generated inventory
291 hosts: undercloud 291 hosts: undercloud
292 gather_facts: yes 292 gather_facts: true
293 vars: 293 vars:
294 inventory: all 294 inventory: all
295 roles: 295 roles:
diff --git a/roles/build-test-packages/tasks/main.yml b/roles/build-test-packages/tasks/main.yml
index 93fb57e..9abadb1 100644
--- a/roles/build-test-packages/tasks/main.yml
+++ b/roles/build-test-packages/tasks/main.yml
@@ -18,32 +18,32 @@
18 when: python_cmd is not defined 18 when: python_cmd is not defined
19 19
20- name: Ensure DLRN package dependencies 20- name: Ensure DLRN package dependencies
21 become: yes 21 become: true
22 package: 22 package:
23 state: present 23 state: present
24 name: 24 name:
25 - createrepo 25 - createrepo
26 - gcc 26 - gcc
27 - git 27 - git
28 - libffi-devel 28 - libffi-devel
29 - mock 29 - mock
30 - openssl-devel 30 - openssl-devel
31 - redhat-rpm-config 31 - redhat-rpm-config
32 - rsync 32 - rsync
33 - rpm-build 33 - rpm-build
34 - rpmdevtools 34 - rpmdevtools
35 - sqlite 35 - sqlite
36 - > 36 - >
37 {% if ansible_python.version.major == 3 %} 37 {% if ansible_python.version.major == 3 %}
38 python3-libselinux 38 python3-libselinux
39 {% else %} 39 {% else %}
40 libselinux-python 40 libselinux-python
41 {% endif %} 41 {% endif %}
42 42
43- name: Check if virtualenv is in the system 43- name: Check if virtualenv is in the system
44 shell: "{{ python_cmd }} -m virtualenv --version" 44 shell: "{{ python_cmd }} -m virtualenv --version"
45 args: 45 args:
46 warn: no 46 warn: false
47 register: virtualenv_exist 47 register: virtualenv_exist
48 changed_when: false 48 changed_when: false
49 failed_when: false 49 failed_when: false
@@ -60,17 +60,17 @@
60 {% endif %} 60 {% endif %}
61 61
62- name: Create mock group 62- name: Create mock group
63 become: yes 63 become: true
64 group: 64 group:
65 name: mock 65 name: mock
66 state: present 66 state: present
67 67
68- name: Add user to mock group 68- name: Add user to mock group
69 become: yes 69 become: true
70 user: 70 user:
71 name: '{{ ansible_user_id }}' 71 name: '{{ ansible_user_id }}'
72 groups: mock 72 groups: mock
73 append: yes 73 append: true
74 74
75- name: Ensure DLRN dir is present 75- name: Ensure DLRN dir is present
76 file: 76 file:
@@ -81,7 +81,7 @@
81 shell: 81 shell:
82 rm -rf '{{ build_repo_dir }}/DLRN/*' 82 rm -rf '{{ build_repo_dir }}/DLRN/*'
83 args: 83 args:
84 warn: no 84 warn: false
85 register: result 85 register: result
86 changed_when: result.stdout or result.stderr 86 changed_when: result.stdout or result.stderr
87 87
@@ -117,7 +117,7 @@
117 pip install -r requirements.txt; 117 pip install -r requirements.txt;
118 python setup.py install; 118 python setup.py install;
119 args: 119 args:
120 chdir: '{{ build_repo_dir }}/DLRN' 120 chdir: '{{ build_repo_dir }}/DLRN'
121 when: dlrn_pre_installed|bool 121 when: dlrn_pre_installed|bool
122 122
123- name: copy the DLRN scripts in the virtualenv to the scripts dir 123- name: copy the DLRN scripts in the virtualenv to the scripts dir
@@ -138,8 +138,10 @@
138 gawk '{ print $0 }; /^# repos$/ { exit }' {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}.cfg 138 gawk '{ print $0 }; /^# repos$/ { exit }' {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}.cfg
139 > {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; 139 > {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
140 cat /etc/yum.repos.d/quickstart-{{ ansible_distribution | lower }}-*.repo >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; 140 cat /etc/yum.repos.d/quickstart-{{ ansible_distribution | lower }}-*.repo >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
141 find /etc/yum.repos.d -name "delorean*repo" ! -name "delorean*build-deps.repo" -exec cat {} \; >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; 141 find /etc/yum.repos.d -name "delorean*repo" ! -name "delorean*build-deps.repo" -exec cat {} \;
142 find /etc/yum.repos.d -name "delorean*build-deps.repo" -exec sed 's/enabled=.*/enabled=1/g' {} \; >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; 142 >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
143 find /etc/yum.repos.d -name "delorean*build-deps.repo" -exec sed 's/enabled=.*/enabled=1/g' {} \;
144 >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
143 echo '"""' >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg; 145 echo '"""' >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
144 mkdir -p /tmp/fake-dlrn-repos/current; 146 mkdir -p /tmp/fake-dlrn-repos/current;
145 touch /tmp/fake-dlrn-repos/delorean-deps.repo; 147 touch /tmp/fake-dlrn-repos/delorean-deps.repo;
@@ -224,7 +226,7 @@
224 exit $?; 226 exit $?;
225 done; 227 done;
226 args: 228 args:
227 chdir: '{{ build_repo_dir }}/DLRN' 229 chdir: '{{ build_repo_dir }}/DLRN'
228 register: repo_built_multi 230 register: repo_built_multi
229 when: not artg_build_one|bool 231 when: not artg_build_one|bool
230 232
diff --git a/roles/collect-logs/tasks/ara_influxdb.yml b/roles/collect-logs/tasks/ara_influxdb.yml
index 8908254..c58afe4 100644
--- a/roles/collect-logs/tasks/ara_influxdb.yml
+++ b/roles/collect-logs/tasks/ara_influxdb.yml
@@ -16,7 +16,7 @@
16 only_successful_tasks: "{{ influxdb_only_successful_tasks }}" 16 only_successful_tasks: "{{ influxdb_only_successful_tasks }}"
17 17
18- name: Get ARA json data for undercloud 18- name: Get ARA json data for undercloud
19 become: yes 19 become: true
20 shell: "{{ local_working_dir }}/bin/ara result list --all -f json" 20 shell: "{{ local_working_dir }}/bin/ara result list --all -f json"
21 register: ara_root_data 21 register: ara_root_data
22 22
diff --git a/roles/collect-logs/tasks/collect.yml b/roles/collect-logs/tasks/collect.yml
index 0130962..b1b00c6 100644
--- a/roles/collect-logs/tasks/collect.yml
+++ b/roles/collect-logs/tasks/collect.yml
@@ -306,7 +306,7 @@
306 dest: "/tmp/{{ inventory_hostname }}-rsync-filter" 306 dest: "/tmp/{{ inventory_hostname }}-rsync-filter"
307 307
308- name: Gather the logs to /tmp 308- name: Gather the logs to /tmp
309 become: yes 309 become: true
310 shell: > 310 shell: >
311 set -o pipefail && 311 set -o pipefail &&
312 rsync --quiet --recursive --copy-links --prune-empty-dirs 312 rsync --quiet --recursive --copy-links --prune-empty-dirs
@@ -333,16 +333,16 @@
333 fetch: 333 fetch:
334 src: "/tmp/{{ inventory_hostname }}.tar.gz" 334 src: "/tmp/{{ inventory_hostname }}.tar.gz"
335 dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar.gz" 335 dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar.gz"
336 flat: yes 336 flat: true
337 validate_checksum: no 337 validate_checksum: false
338 when: artcl_tar_gz|bool 338 when: artcl_tar_gz|bool
339 339
340- name: Fetch log archive (tar) 340- name: Fetch log archive (tar)
341 fetch: 341 fetch:
342 src: "/tmp/{{ inventory_hostname }}.tar" 342 src: "/tmp/{{ inventory_hostname }}.tar"
343 dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar" 343 dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar"
344 flat: yes 344 flat: true
345 validate_checksum: no 345 validate_checksum: false
346 when: artcl_gzip_only|bool 346 when: artcl_gzip_only|bool
347 347
348- name: Delete temporary log directory after collection 348- name: Delete temporary log directory after collection
diff --git a/roles/collect-logs/tasks/create-docs.yml b/roles/collect-logs/tasks/create-docs.yml
index 65425ea..1577793 100644
--- a/roles/collect-logs/tasks/create-docs.yml
+++ b/roles/collect-logs/tasks/create-docs.yml
@@ -8,8 +8,8 @@
8 shell: > 8 shell: >
9 gunzip "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh.gz"; 9 gunzip "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh.gz";
10 with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}" 10 with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
11 ignore_errors: yes 11 ignore_errors: true
12 when: artcl_gzip_only|bool 12 when: artcl_gzip_only|bool
13 13
14- name: Generate rST docs from scripts and move to Sphinx src dir 14- name: Generate rST docs from scripts and move to Sphinx src dir
15 shell: > 15 shell: >
@@ -17,19 +17,19 @@
17 "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh" > \ 17 "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh" > \
18 "{{ artcl_docs_source_dir }}/{{ item }}.rst" 18 "{{ artcl_docs_source_dir }}/{{ item }}.rst"
19 with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}" 19 with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
20 ignore_errors: yes 20 ignore_errors: true
21 21
22- name: Fetch static rST docs to include in output docs 22- name: Fetch static rST docs to include in output docs
23 shell: > 23 shell: >
24 cp "{{ artcl_docs_source_dir }}/../static/{{ item }}.rst" "{{ artcl_docs_source_dir }}" 24 cp "{{ artcl_docs_source_dir }}/../static/{{ item }}.rst" "{{ artcl_docs_source_dir }}"
25 with_items: "{{ artcl_create_docs_payload.included_static_docs }}" 25 with_items: "{{ artcl_create_docs_payload.included_static_docs }}"
26 ignore_errors: yes 26 ignore_errors: true
27 27
28- name: Generate fresh index.rst for Sphinx 28- name: Generate fresh index.rst for Sphinx
29 template: 29 template:
30 src: index.rst.j2 30 src: index.rst.j2
31 dest: "{{ artcl_docs_source_dir }}/index.rst" 31 dest: "{{ artcl_docs_source_dir }}/index.rst"
32 force: yes 32 force: true
33 33
34- name: Ensure docs dir exists 34- name: Ensure docs dir exists
35 file: 35 file:
@@ -41,4 +41,4 @@
41 set -o pipefail && 41 set -o pipefail &&
42 sphinx-build -b html "{{ artcl_docs_source_dir }}" "{{ artcl_docs_build_dir }}" 42 sphinx-build -b html "{{ artcl_docs_source_dir }}" "{{ artcl_docs_build_dir }}"
43 2>&1 {{ timestamper_cmd }} > {{ artcl_collect_dir }}/docs/sphinx_build.log 43 2>&1 {{ timestamper_cmd }} > {{ artcl_collect_dir }}/docs/sphinx_build.log
44 ignore_errors: yes 44 ignore_errors: true
diff --git a/roles/collect-logs/tasks/publish.yml b/roles/collect-logs/tasks/publish.yml
index 2aebdc4..5b95596 100644
--- a/roles/collect-logs/tasks/publish.yml
+++ b/roles/collect-logs/tasks/publish.yml
@@ -21,35 +21,35 @@
21 {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.json; 21 {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.json;
22 cp -r {{ local_working_dir }}/ara_oooq {{ artcl_collect_dir }}/; 22 cp -r {{ local_working_dir }}/ara_oooq {{ artcl_collect_dir }}/;
23 {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq;{% endif %} 23 {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq;{% endif %}
24 ignore_errors: yes 24 ignore_errors: true
25 25
26- name: Generate and retrieve root the ARA static playbook report 26- name: Generate and retrieve root the ARA static playbook report
27 become: yes 27 become: true
28 shell: > 28 shell: >
29 {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_root; 29 {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_root;
30 {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.root.json; 30 {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.root.json;
31 cp -r {{ local_working_dir }}/ara_oooq_root {{ artcl_collect_dir }}/; 31 cp -r {{ local_working_dir }}/ara_oooq_root {{ artcl_collect_dir }}/;
32 {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_root;{% endif %} 32 {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_root;{% endif %}
33 ignore_errors: yes 33 ignore_errors: true
34 34
35- name: Generate and retrieve the ARA static playbook report for OC deploy 35- name: Generate and retrieve the ARA static playbook report for OC deploy
36 become: yes 36 become: true
37 shell: > 37 shell: >
38 {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_oc; 38 {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_oc;
39 {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.oc.json; 39 {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.oc.json;
40 cp -r {{ local_working_dir }}/ara_oooq_oc {{ artcl_collect_dir }}/; 40 cp -r {{ local_working_dir }}/ara_oooq_oc {{ artcl_collect_dir }}/;
41 {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_oc;{% endif %} 41 {% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_oc;{% endif %}
42 ignore_errors: yes 42 ignore_errors: true
43 environment: 43 environment:
44 ARA_DATABASE: 'sqlite:///{{ ara_overcloud_db_path }}' 44 ARA_DATABASE: 'sqlite:///{{ ara_overcloud_db_path }}'
45 45
46- include: ara_graphite.yml 46- include: ara_graphite.yml
47 when: ara_graphite_server is defined 47 when: ara_graphite_server is defined
48 ignore_errors: yes 48 ignore_errors: true
49 49
50- include: ara_influxdb.yml 50- include: ara_influxdb.yml
51 when: influxdb_url is defined or influxdb_create_data_file|bool 51 when: influxdb_url is defined or influxdb_create_data_file|bool
52 ignore_errors: yes 52 ignore_errors: true
53 53
54- name: fetch stackviz results to the root of the collect_dir 54- name: fetch stackviz results to the root of the collect_dir
55 shell: > 55 shell: >
diff --git a/roles/freeipa-setup/README.md b/roles/freeipa-setup/README.md
index ab7d338..705b40a 100644
--- a/roles/freeipa-setup/README.md
+++ b/roles/freeipa-setup/README.md
@@ -30,7 +30,7 @@ Sample playbook to call the role
30# Deploy the FreeIPA Server 30# Deploy the FreeIPA Server
31- name: Deploy FreeIPA 31- name: Deploy FreeIPA
32 hosts: freeipa_host 32 hosts: freeipa_host
33 gather_facts: no 33 gather_facts: false
34 roles: 34 roles:
35 - freeipa-setup 35 - freeipa-setup
36``` 36```
diff --git a/roles/install-built-repo/README.md b/roles/install-built-repo/README.md
index 164636d..c84143b 100644
--- a/roles/install-built-repo/README.md
+++ b/roles/install-built-repo/README.md
@@ -36,13 +36,13 @@ Including an example of how to use this role
36 --- 36 ---
37 - name: Run repo install 37 - name: Run repo install
38 hosts: undercloud 38 hosts: undercloud
39 gather_facts: no 39 gather_facts: false
40 roles: 40 roles:
41 - install-built-repo 41 - install-built-repo
42 42
43 - name: Run repo install 43 - name: Run repo install
44 hosts: undercloud 44 hosts: undercloud
45 gather_facts: no 45 gather_facts: false
46 vars: 46 vars:
47 ib_repo_image_inject: true 47 ib_repo_image_inject: true
48 ib_repo_image_path: "{{ working_dir }}/overcloud-full.qcow2" 48 ib_repo_image_path: "{{ working_dir }}/overcloud-full.qcow2"
diff --git a/roles/multinodes/README.md b/roles/multinodes/README.md
index 2e9d9c8..0ee813b 100644
--- a/roles/multinodes/README.md
+++ b/roles/multinodes/README.md
@@ -52,7 +52,7 @@ Example Playbook
52 --- 52 ---
53 - name: Multinode 53 - name: Multinode
54 hosts: localhost 54 hosts: localhost
55 gather_facts: no 55 gather_facts: false
56 roles: 56 roles:
57 - role: multinodes 57 - role: multinodes
58 58
diff --git a/roles/overcloud-prep-flavors/README.md b/roles/overcloud-prep-flavors/README.md
index 6a5bb14..c833754 100644
--- a/roles/overcloud-prep-flavors/README.md
+++ b/roles/overcloud-prep-flavors/README.md
@@ -30,7 +30,7 @@ Example Playbook
30 30
31 - name: Copy configuration files 31 - name: Copy configuration files
32 hosts: virthost 32 hosts: virthost
33 gather_facts: no 33 gather_facts: false
34 roles: 34 roles:
35 - ansible-role-tripleo-overcloud-prep-config 35 - ansible-role-tripleo-overcloud-prep-config
36 36
diff --git a/roles/overcloud-prep-images/README.md b/roles/overcloud-prep-images/README.md
index 7cfc620..f6ed143 100644
--- a/roles/overcloud-prep-images/README.md
+++ b/roles/overcloud-prep-images/README.md
@@ -47,7 +47,7 @@ Example Playbook
47 47
48 - name: Copy configuration files 48 - name: Copy configuration files
49 hosts: virthost 49 hosts: virthost
50 gather_facts: no 50 gather_facts: false
51 roles: 51 roles:
52 - ansible-role-tripleo-overcloud-prep-config 52 - ansible-role-tripleo-overcloud-prep-config
53 53
diff --git a/roles/overcloud-prep-network/README.md b/roles/overcloud-prep-network/README.md
index 2e0b757..88da2e3 100644
--- a/roles/overcloud-prep-network/README.md
+++ b/roles/overcloud-prep-network/README.md
@@ -76,7 +76,7 @@ Example Playbook
76 76
77 - name: Copy configuration files 77 - name: Copy configuration files
78 hosts: virthost 78 hosts: virthost
79 gather_facts: no 79 gather_facts: false
80 roles: 80 roles:
81 - ansible-role-tripleo-overcloud-prep-config 81 - ansible-role-tripleo-overcloud-prep-config
82 82
diff --git a/roles/snapshot-libvirt/README.md b/roles/snapshot-libvirt/README.md
index d36e0dc..42f3e90 100644
--- a/roles/snapshot-libvirt/README.md
+++ b/roles/snapshot-libvirt/README.md
@@ -39,7 +39,7 @@ Example Usage
39--- 39---
40- name: Create a snapshot (or update a snapshot) 40- name: Create a snapshot (or update a snapshot)
41 hosts: virthost 41 hosts: virthost
42 gather_facts: yes 42 gather_facts: true
43 vars: 43 vars:
44 - snapshot_create: true 44 - snapshot_create: true
45 - libvirt_volume_path: /opt/vm_images 45 - libvirt_volume_path: /opt/vm_images
@@ -53,7 +53,7 @@ Example Usage
53 53
54- name: Restore a snapshot 54- name: Restore a snapshot
55 hosts: virthost 55 hosts: virthost
56 gather_facts: yes 56 gather_facts: true
57 vars: 57 vars:
58 - snapshot_restore: true 58 - snapshot_restore: true
59 - libvirt_volume_path: /opt/vm_images 59 - libvirt_volume_path: /opt/vm_images
diff --git a/roles/undercloud-deploy/README.md b/roles/undercloud-deploy/README.md
index c8dbf13..49747c6 100644
--- a/roles/undercloud-deploy/README.md
+++ b/roles/undercloud-deploy/README.md
@@ -196,7 +196,7 @@ Sample playbook to call the role
196# Deploy the undercloud 196# Deploy the undercloud
197- name: Install undercloud 197- name: Install undercloud
198 hosts: undercloud 198 hosts: undercloud
199 gather_facts: no 199 gather_facts: false
200 roles: 200 roles:
201 - undercloud-deploy 201 - undercloud-deploy
202``` 202```
@@ -319,7 +319,7 @@ And an example playbook to call the role is:
319# Deploy the undercloud 319# Deploy the undercloud
320- name: Deploy undercloud (experimental) 320- name: Deploy undercloud (experimental)
321 hosts: undercloud 321 hosts: undercloud
322 gather_facts: no 322 gather_facts: false
323 vars: 323 vars:
324 containerized_undercloud: true 324 containerized_undercloud: true
325 undercloud_install_script: undercloud-deploy.sh.j2 325 undercloud_install_script: undercloud-deploy.sh.j2
diff --git a/roles/undercloud-setup/README.md b/roles/undercloud-setup/README.md
index 2409a4f..fd7fe35 100644
--- a/roles/undercloud-setup/README.md
+++ b/roles/undercloud-setup/README.md
@@ -58,7 +58,7 @@ Example Playbook
58 58
59 - name: Set up CentOS undercloud node to run TripleO Quickstart 59 - name: Set up CentOS undercloud node to run TripleO Quickstart
60 hosts: undercloud 60 hosts: undercloud
61 gather_facts: no 61 gather_facts: false
62 roles: 62 roles:
63 - undercloud-setup 63 - undercloud-setup
64 64
diff --git a/roles/undercloud-setup/tasks/ovb_setup_connectivity.yml b/roles/undercloud-setup/tasks/ovb_setup_connectivity.yml
index fdee288..90e051d 100644
--- a/roles/undercloud-setup/tasks/ovb_setup_connectivity.yml
+++ b/roles/undercloud-setup/tasks/ovb_setup_connectivity.yml
@@ -11,7 +11,7 @@
11 mode: 0755 11 mode: 0755
12 12
13- name: Setup interfaces, connectivity on the undercloud 13- name: Setup interfaces, connectivity on the undercloud
14 become: yes 14 become: true
15 shell: > 15 shell: >
16 set -o pipefail && 16 set -o pipefail &&
17 {{ working_dir }}/ovb-undercloud-connectivity.sh 2>&1 {{ timestamper_cmd }} > 17 {{ working_dir }}/ovb-undercloud-connectivity.sh 2>&1 {{ timestamper_cmd }} >
diff --git a/roles/validate-tempest/README.md b/roles/validate-tempest/README.md
index 283181b..bd11022 100644
--- a/roles/validate-tempest/README.md
+++ b/roles/validate-tempest/README.md
@@ -145,7 +145,7 @@ Example Playbook
145 --- 145 ---
146 - name: Run tempest 146 - name: Run tempest
147 hosts: undercloud 147 hosts: undercloud
148 gather_facts: no 148 gather_facts: false
149 roles: 149 roles:
150 - validate-tempest 150 - validate-tempest
151 151
diff --git a/roles/validate-tempest/tasks/main.yml b/roles/validate-tempest/tasks/main.yml
index dfa42bf..0d44be9 100644
--- a/roles/validate-tempest/tasks/main.yml
+++ b/roles/validate-tempest/tasks/main.yml
@@ -53,7 +53,7 @@
53 when: run_tempest|bool 53 when: run_tempest|bool
54 tags: 54 tags:
55 - run-stackviz 55 - run-stackviz
56 ignore_errors: yes 56 ignore_errors: true
57 57
58- include: post-tempest.yml 58- include: post-tempest.yml
59 when: post_tempest|bool and run_tempest|bool 59 when: post_tempest|bool and run_tempest|bool
diff --git a/roles/validate-tempest/tasks/pre-tempest.yml b/roles/validate-tempest/tasks/pre-tempest.yml
index ba6a0df..38b0a35 100644
--- a/roles/validate-tempest/tasks/pre-tempest.yml
+++ b/roles/validate-tempest/tasks/pre-tempest.yml
@@ -1,16 +1,16 @@
1--- 1---
2- name: Set the number of workers in tempest 2- name: Set the number of workers in tempest
3 set_fact: 3 set_fact:
4 tempest_workers: "{{ ansible_processor_vcpus|int // 2 }}" 4 tempest_workers: "{{ ansible_processor_vcpus|int // 2 }}"
5 when: tempest_workers is not defined 5 when: tempest_workers is not defined
6 6
7- name: Set rc file to be sourced to run tempest 7- name: Set rc file to be sourced to run tempest
8 set_fact: 8 set_fact:
9 rc_file: "{{ working_dir }}/{% if tempest_undercloud %}stackrc{% else %}overcloudrc{% endif %}" 9 rc_file: "{{ working_dir }}/{% if tempest_undercloud %}stackrc{% else %}overcloudrc{% endif %}"
10 10
11- name: Set rc file to be sourced to run tempest with in container 11- name: Set rc file to be sourced to run tempest with in container
12 set_fact: 12 set_fact:
13 rc_file_container: "{{ tempest_data }}/{% if tempest_undercloud %}stackrc{% else %}overcloudrc{% endif %}" 13 rc_file_container: "{{ tempest_data }}/{% if tempest_undercloud %}stackrc{% else %}overcloudrc{% endif %}"
14 when: tempest_format == 'container' 14 when: tempest_format == 'container'
15 15
16- name: Create overcloud tempest setup script 16- name: Create overcloud tempest setup script
@@ -44,17 +44,20 @@
44 when: tempest_whitelist|length > 0 44 when: tempest_whitelist|length > 0
45 45
46- name: Install packages to generate subunit results 46- name: Install packages to generate subunit results
47 become: yes 47 become: true
48 package: name={{ item }} state=present 48 package:
49 with_items: 49 name:
50 - python-subunit 50 - python-subunit
51 - subunit-filters 51 - subunit-filters
52 - python-os-testr 52 - python-os-testr
53 state: present
53 when: tempest_format in ['container', 'packages'] 54 when: tempest_format in ['container', 'packages']
54 55
55- name: Install stestr 56- name: Install stestr
56 become: yes 57 become: true
57 package: name=python-stestr state=present 58 package:
59 name: python-stestr
60 state: present
58 when: tempest_format in ['container', 'packages'] and release not in ['newton', 'ocata'] 61 when: tempest_format in ['container', 'packages'] and release not in ['newton', 'ocata']
59 62
60- ignore_errors: true 63- ignore_errors: true
@@ -87,5 +90,5 @@
87 --to-file "{{ working_dir }}/{{ skip_file }}" --format txt 90 --to-file "{{ working_dir }}/{{ skip_file }}" --format txt
88 args: 91 args:
89 chdir: "{{ working_dir }}/bugcheck" 92 chdir: "{{ working_dir }}/bugcheck"
90 ignore_errors: yes 93 ignore_errors: true
91 when: check_tempest_bugs|bool 94 when: check_tempest_bugs|bool
diff --git a/roles/validate-tempest/tasks/tempest-results.yml b/roles/validate-tempest/tasks/tempest-results.yml
index 4917ddd..5638aa7 100644
--- a/roles/validate-tempest/tasks/tempest-results.yml
+++ b/roles/validate-tempest/tasks/tempest-results.yml
@@ -41,13 +41,13 @@
41 fetch: 41 fetch:
42 src: "{{ working_dir }}/tempest/tempest.html" 42 src: "{{ working_dir }}/tempest/tempest.html"
43 dest: "{{ local_working_dir }}/tempest.html" 43 dest: "{{ local_working_dir }}/tempest.html"
44 flat: yes 44 flat: true
45 45
46 - name: Fetch nosetests results 46 - name: Fetch nosetests results
47 fetch: 47 fetch:
48 src: "{{ working_dir }}/tempest/tempest.xml" 48 src: "{{ working_dir }}/tempest/tempest.xml"
49 dest: "{{ local_working_dir }}/nosetests.xml" 49 dest: "{{ local_working_dir }}/nosetests.xml"
50 flat: yes 50 flat: true
51 51
52 - name: Copying tempestmail files 52 - name: Copying tempestmail files
53 synchronize: 53 synchronize:
@@ -71,5 +71,4 @@
71 --skip-file "{{ working_dir }}/tempestmail/tempest_skip_{{ release }}.yml" 71 --skip-file "{{ working_dir }}/tempestmail/tempest_skip_{{ release }}.yml"
72 args: 72 args:
73 chdir: "{{ working_dir }}/tempestmail" 73 chdir: "{{ working_dir }}/tempestmail"
74 ignore_errors: yes 74 ignore_errors: true
75
diff --git a/roles/validate-tempest/tasks/tempest-rpm.yml b/roles/validate-tempest/tasks/tempest-rpm.yml
index c784917..3437943 100644
--- a/roles/validate-tempest/tasks/tempest-rpm.yml
+++ b/roles/validate-tempest/tasks/tempest-rpm.yml
@@ -19,7 +19,7 @@
19- name: Install openstack services tempest plugins 19- name: Install openstack services tempest plugins
20 yum: state=latest name={{ item }} 20 yum: state=latest name={{ item }}
21 with_items: "{{ tempest_plugins }}" 21 with_items: "{{ tempest_plugins }}"
22 become: yes 22 become: true
23 when: tempest_plugins|length > 0 23 when: tempest_plugins|length > 0
24 24
25- name: Install openstack tempest 25- name: Install openstack tempest
@@ -38,8 +38,8 @@
38 38
39- name: Set tempest init command 39- name: Set tempest init command
40 set_fact: 40 set_fact:
41 tempest_init: "{% if release == 'newton' %}/usr/share/openstack-tempest-*/tools/configure-tempest-directory{% else %}tempest init {{ tempest_dir }}{% endif %}" 41 tempest_init: "{% if release == 'newton' %}/usr/share/openstack-tempest-*/tools/configure-tempest-directory{% else %}tempest init {{ tempest_dir }}{% endif %}"
42 42
43- name: Set tempestconf call 43- name: Set tempestconf call
44 set_fact: 44 set_fact:
45 tempestconf: "{% if release == 'newton' %}{{ tempest_dir }}/tools/config_tempest.py{% else %}/usr/bin/discover-tempest-config{% endif %}" 45 tempestconf: "{% if release == 'newton' %}{{ tempest_dir }}/tools/config_tempest.py{% else %}/usr/bin/discover-tempest-config{% endif %}"
diff --git a/roles/validate-ui/defaults/main.yml b/roles/validate-ui/defaults/main.yml
index d7036da..e4aea67 100644
--- a/roles/validate-ui/defaults/main.yml
+++ b/roles/validate-ui/defaults/main.yml
@@ -2,4 +2,4 @@
2validate_ui_simple: false 2validate_ui_simple: false
3ui_validate_simple_script: validate_ui_simple.sh.j2 3ui_validate_simple_script: validate_ui_simple.sh.j2
4ui_validate_simple_log: validate_ui_simple.log 4ui_validate_simple_log: validate_ui_simple.log
5virthost_addr: "{{ hostvars[groups['virthost'][0]].ansible_host }}" \ No newline at end of file 5virthost_addr: "{{ hostvars[groups['virthost'][0]].ansible_host }}"
diff --git a/roles/validate-ui/meta/main.yml b/roles/validate-ui/meta/main.yml
index 819da26..98bfef3 100644
--- a/roles/validate-ui/meta/main.yml
+++ b/roles/validate-ui/meta/main.yml
@@ -1,2 +1,3 @@
1---
1dependencies: 2dependencies:
2 - extras-common 3 - extras-common
diff --git a/roles/virthost-full-cleanup/meta/main.yml b/roles/virthost-full-cleanup/meta/main.yml
index 819da26..98bfef3 100644
--- a/roles/virthost-full-cleanup/meta/main.yml
+++ b/roles/virthost-full-cleanup/meta/main.yml
@@ -1,2 +1,3 @@
1---
1dependencies: 2dependencies:
2 - extras-common 3 - extras-common
diff --git a/roles/virthost-full-cleanup/tasks/main.yml b/roles/virthost-full-cleanup/tasks/main.yml
index c7c6546..8af6360 100644
--- a/roles/virthost-full-cleanup/tasks/main.yml
+++ b/roles/virthost-full-cleanup/tasks/main.yml
@@ -25,7 +25,7 @@
25 with_items: "{{ vms.list_vms }}" 25 with_items: "{{ vms.list_vms }}"
26 26
27 - name: destroy any remaining vms 27 - name: destroy any remaining vms
28 virt : command=destroy name={{ item }} 28 virt: command=destroy name={{ item }}
29 with_items: "{{ vms.list_vms }}" 29 with_items: "{{ vms.list_vms }}"
30 30
31 - name: remove images from /var/lib/libvirt/images 31 - name: remove images from /var/lib/libvirt/images
@@ -51,11 +51,11 @@
51 command: virsh net-destroy default 51 command: virsh net-destroy default
52 52
53 - name: destroy default pool 53 - name: destroy default pool
54 become: yes 54 become: true
55 command: virsh pool-destroy default 55 command: virsh pool-destroy default
56 56
57 - name: destroy local libvirt storage, networks and config 57 - name: destroy local libvirt storage, networks and config
58 become: yes 58 become: true
59 shell: "rm -rf {{ working_dir }}/.config/libvirt" 59 shell: "rm -rf {{ working_dir }}/.config/libvirt"
60 60
61 - name: get user_id for stack user 61 - name: get user_id for stack user
@@ -118,7 +118,7 @@
118 118
119 - name: kill all the network managers processes 119 - name: kill all the network managers processes
120 shell: kill -9 $(ps aux | grep NetworkManager | awk '{print $2}') 120 shell: kill -9 $(ps aux | grep NetworkManager | awk '{print $2}')
121 ignore_errors: yes # When no NM running, killall exits with 1 121 ignore_errors: true # When no NM running, killall exits with 1
122 122
123 - name: ensure the network service is enabled 123 - name: ensure the network service is enabled
124 service: name=network enabled=yes 124 service: name=network enabled=yes
@@ -130,32 +130,33 @@
130 - /usr/bin/instack-setup-host 130 - /usr/bin/instack-setup-host
131 131
132 - name: remove any instack rpms from the host 132 - name: remove any instack rpms from the host
133 yum: name={{item}} state=absent 133 yum:
134 ignore_errors: yes 134 name:
135 with_items: 135 - instack-*
136 - instack-* 136 - rdo-release
137 - rdo-release 137 - rhos-release
138 - rhos-release 138 - libvirt
139 - libvirt 139 - libvirt-daemon
140 - libvirt-daemon 140 - openvswitch
141 - openvswitch 141 - NetworkManager
142 - NetworkManager 142 - qemu-*
143 - qemu-* 143 - openstack-*
144 - openstack-* 144 - python-qpid-*
145 - python-qpid-* 145 - pexpect
146 - pexpect 146 - python-pexpect
147 - python-pexpect 147 - python-tuskarclient*
148 - python-tuskarclient* 148 - python-keystone*
149 - python-keystone* 149 - python-openstackclient
150 - python-openstackclient 150 - python-oslo*
151 - python-oslo* 151 - python-qpid
152 - python-qpid 152 - python-ironic*
153 - python-ironic* 153 - python-eventlet
154 - python-eventlet 154 - tripleo-*
155 - tripleo-* 155 - python-rdomanager-*
156 - python-rdomanager-* 156 - jq
157 - jq 157 - python-tripleo*
158 - python-tripleo* 158 state: absent
159 ignore_errors: true
159 160
160 - name: find any remaining rpms from director repos 161 - name: find any remaining rpms from director repos
161 shell: "yumdb search from_repo rhelosp-*-director* | egrep -v from_repo | grep -v '^$' | tail -n +2 " 162 shell: "yumdb search from_repo rhelosp-*-director* | egrep -v from_repo | grep -v '^$' | tail -n +2 "
@@ -170,7 +171,7 @@
170 register: delorean_rpms 171 register: delorean_rpms
171 172
172 # BUG: when this task encounters an rpm of the form "1:somerpm" it fails 173 # BUG: when this task encounters an rpm of the form "1:somerpm" it fails
173 #- name: debug 174 # - name: debug
174 # debug: var={{ item }} 175 # debug: var={{ item }}
175 # with_flattened: 176 # with_flattened:
176 # - director_rpms.stdout_lines 177 # - director_rpms.stdout_lines
@@ -179,7 +180,7 @@
179 180
180 - name: remove any openstack rpms from the host 181 - name: remove any openstack rpms from the host
181 yum: name={{item}} state=absent 182 yum: name={{item}} state=absent
182 ignore_errors: yes 183 ignore_errors: true
183 with_flattened: 184 with_flattened:
184 - "{{ director_rpms.stdout_lines }}" 185 - "{{ director_rpms.stdout_lines }}"
185 - "{{ rhos_rpms.stdout_lines }}" 186 - "{{ rhos_rpms.stdout_lines }}"
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index e0fdbdd..0e441c1 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,3 +1,4 @@
1---
1- project: 2- project:
2 templates: 3 templates:
3 - tripleo-undercloud-jobs 4 - tripleo-undercloud-jobs