Browse Source

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
Sorin Sbarnea 5 months ago
parent
commit
cc82349363
62 changed files with 357 additions and 334 deletions
  1. 23
    23
      playbooks/baremetal-full-overcloud-prep.yml
  2. 14
    15
      playbooks/baremetal-full-overcloud-validate.yml
  3. 9
    10
      playbooks/baremetal-full-overcloud.yml
  4. 10
    10
      playbooks/baremetal-full-undercloud.yml
  5. 6
    7
      playbooks/baremetal-prep-virthost.yml
  6. 4
    4
      playbooks/baremetal-undercloud.yml
  7. 2
    2
      playbooks/build-images-v2.yml
  8. 2
    2
      playbooks/build-test-packages.yml
  9. 2
    2
      playbooks/cleanup-destructive.yml
  10. 4
    4
      playbooks/collect-logs.yml
  11. 5
    4
      playbooks/deploy-delete.yml
  12. 13
    10
      playbooks/multinode-overcloud-prep.yml
  13. 2
    1
      playbooks/multinode-overcloud-update.yml
  14. 4
    3
      playbooks/multinode-overcloud-upgrade.yml
  15. 4
    5
      playbooks/multinode-overcloud.yml
  16. 3
    3
      playbooks/multinode-standalone-upgrade.yml
  17. 4
    4
      playbooks/multinode-standalone.yml
  18. 6
    6
      playbooks/multinode-undercloud.yml
  19. 6
    6
      playbooks/multinode-validate.yml
  20. 2
    2
      playbooks/nodepool-setup.yml
  21. 29
    15
      playbooks/ovb-setup.yml
  22. 1
    1
      playbooks/provision_multinodes.yml
  23. 19
    18
      playbooks/quickstart-extras-overcloud-prep.yml
  24. 9
    8
      playbooks/quickstart-extras-overcloud.yml
  25. 11
    11
      playbooks/quickstart-extras-undercloud.yml
  26. 12
    11
      playbooks/quickstart-extras-validate.yml
  27. 2
    2
      playbooks/repo-setup.yml
  28. 2
    2
      playbooks/scale_nodes_verify.yml
  29. 4
    5
      playbooks/snapshot-libvirt.yml
  30. 2
    2
      playbooks/tempest.yml
  31. 7
    8
      playbooks/tripleo-validations.yml
  32. 1
    1
      roles/baremetal-prep-overcloud/README.md
  33. 1
    3
      roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml
  34. 1
    1
      roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml
  35. 1
    1
      roles/baremetal-prep-virthost/README.md
  36. 1
    1
      roles/baremetal-prep-virthost/tasks/main.yml
  37. 8
    8
      roles/baremetal-undercloud/README.md
  38. 29
    27
      roles/build-test-packages/tasks/main.yml
  39. 1
    1
      roles/collect-logs/tasks/ara_influxdb.yml
  40. 5
    5
      roles/collect-logs/tasks/collect.yml
  41. 6
    6
      roles/collect-logs/tasks/create-docs.yml
  42. 7
    7
      roles/collect-logs/tasks/publish.yml
  43. 1
    1
      roles/freeipa-setup/README.md
  44. 2
    2
      roles/install-built-repo/README.md
  45. 1
    1
      roles/multinodes/README.md
  46. 1
    1
      roles/overcloud-prep-flavors/README.md
  47. 1
    1
      roles/overcloud-prep-images/README.md
  48. 1
    1
      roles/overcloud-prep-network/README.md
  49. 2
    2
      roles/snapshot-libvirt/README.md
  50. 2
    2
      roles/undercloud-deploy/README.md
  51. 1
    1
      roles/undercloud-setup/README.md
  52. 1
    1
      roles/undercloud-setup/tasks/ovb_setup_connectivity.yml
  53. 1
    1
      roles/validate-tempest/README.md
  54. 1
    1
      roles/validate-tempest/tasks/main.yml
  55. 15
    12
      roles/validate-tempest/tasks/pre-tempest.yml
  56. 3
    4
      roles/validate-tempest/tasks/tempest-results.yml
  57. 3
    3
      roles/validate-tempest/tasks/tempest-rpm.yml
  58. 1
    1
      roles/validate-ui/defaults/main.yml
  59. 1
    0
      roles/validate-ui/meta/main.yml
  60. 1
    0
      roles/virthost-full-cleanup/meta/main.yml
  61. 33
    32
      roles/virthost-full-cleanup/tasks/main.yml
  62. 1
    0
      zuul.d/layout.yaml

+ 23
- 23
playbooks/baremetal-full-overcloud-prep.yml View File

@@ -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 3
   hosts: undercloud
4
-  gather_facts: no
4
+  gather_facts: false
5 5
   roles:
6 6
     - overcloud-prep-network
7 7
   tags:
8 8
     - overcloud-prep-network
9 9
 
10
-- name:  copy over config files
10
+- name: copy over config files
11 11
   hosts: undercloud
12
-  gather_facts: no
12
+  gather_facts: false
13 13
   roles:
14 14
     - overcloud-prep-config
15 15
   tags:
16 16
     - overcloud-prep-config
17 17
 
18
-- name:  Perpare the baremetal overcloud
18
+- name: Perpare the baremetal overcloud
19 19
   hosts: undercloud
20
-  gather_facts: yes
20
+  gather_facts: true
21 21
   roles:
22 22
     - baremetal-prep-overcloud
23 23
   tags:
24 24
     - baremetal-prep-overcloud
25 25
 
26
-- name:  Prepare overcloud containers
26
+- name: Prepare overcloud containers
27 27
   hosts: undercloud
28
-  gather_facts: no
28
+  gather_facts: false
29 29
   roles:
30
-    - { role: overcloud-prep-containers, when: containerized_overcloud|bool }
30
+    - {role: overcloud-prep-containers, when: containerized_overcloud|bool}
31 31
   tags:
32 32
     - overcloud-prep-containers
33 33
 
34 34
 - name: Run tripleo-validations pre-introspection tests
35 35
   hosts: undercloud
36
-  gather_facts: no
36
+  gather_facts: false
37 37
   tags:
38 38
     - tripleo-validations
39 39
   vars:
40 40
     validations_group: ['pre-introspection']
41 41
   roles:
42
-    - { role: tripleo-validations,
43
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
42
+    - {role: tripleo-validations,
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 46
   hosts: undercloud
47
-  gather_facts: no
47
+  gather_facts: false
48 48
   roles:
49 49
     - overcloud-prep-images
50 50
   tags:
51 51
     - overcloud-prep-images
52 52
 
53
-- name:  Prepare overcloud flavors
53
+- name: Prepare overcloud flavors
54 54
   hosts: undercloud
55
-  gather_facts: no
55
+  gather_facts: false
56 56
   roles:
57
-    - { role: overcloud-prep-flavors,
58
-        when: step_overcloud_prep_flavors|default(true)|bool }
57
+    - {role: overcloud-prep-flavors,
58
+       when: step_overcloud_prep_flavors|default(true)|bool}
59 59
   tags:
60 60
     - overcloud-prep-flavors
61 61
 
62 62
 - name: Prepare the SSL Configuration for the overcloud deployment
63 63
   hosts: undercloud
64
-  gather_facts: no
64
+  gather_facts: false
65 65
   roles:
66
-    - { role: overcloud-ssl }
66
+    - {role: overcloud-ssl}
67 67
   tags:
68 68
     - overcloud-ssl
69 69
 
70 70
 - name: Run tripleo-validations pre-deployment tests
71 71
   hosts: undercloud
72
-  gather_facts: no
72
+  gather_facts: false
73 73
   tags:
74 74
     - tripleo-validations
75 75
   vars:
76 76
     validations_group: ['pre-deployment']
77 77
   roles:
78
-    - { role: tripleo-validations,
79
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
78
+    - {role: tripleo-validations,
79
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

+ 14
- 15
playbooks/baremetal-full-overcloud-validate.yml View File

@@ -5,43 +5,42 @@
5 5
   tags:
6 6
     - overcloud-validate
7 7
   roles:
8
-    - { role: validate-perf,
9
-        when: validate_performance|bool and run_tempest|bool }
8
+    - {role: validate-perf,
9
+       when: validate_performance|bool and run_tempest|bool}
10 10
   ignore_errors: true
11 11
 
12 12
 - name: Sanity check the overcloud services
13 13
   hosts: undercloud
14 14
   tags:
15 15
     - overcloud-validate
16
-  gather_facts: no
16
+  gather_facts: false
17 17
   roles:
18
-    - { role: validate-sanity-checks,
19
-        when: run_sanity_checks|default(false)|bool }
18
+    - {role: validate-sanity-checks,
19
+       when: run_sanity_checks|default(false)|bool}
20 20
 
21 21
 # Validate the deployment
22
-- name:  validate the overcloud
22
+- name: validate the overcloud
23 23
   hosts: undercloud
24 24
   tags:
25 25
     - overcloud-validate
26
-  gather_facts: no
26
+  gather_facts: false
27 27
   roles:
28
-    - { role: validate-simple, when: test_ping|bool }
28
+    - {role: validate-simple, when: test_ping|bool}
29 29
 
30 30
 # Execute tempest against the overcloud deployment
31
-- name:  Execute tempest against the overcloud
31
+- name: Execute tempest against the overcloud
32 32
   hosts: undercloud
33 33
   tags:
34 34
     - overcloud-validate
35
-  gather_facts: no
35
+  gather_facts: false
36 36
   roles:
37
-    - { role: validate-tempest, when: run_tempest|bool }
37
+    - {role: validate-tempest, when: run_tempest|bool}
38 38
 
39 39
 - name: Delete the overcloud
40 40
   hosts: undercloud
41 41
   tags:
42 42
     - overcloud-delete
43
-  gather_facts: no
43
+  gather_facts: false
44 44
   roles:
45
-    - { role: overcloud-delete,
46
-        when: step_delete_overcloud|default(false)|bool }
47
-
45
+    - {role: overcloud-delete,
46
+       when: step_delete_overcloud|default(false)|bool}

+ 9
- 10
playbooks/baremetal-full-overcloud.yml View File

@@ -1,24 +1,24 @@
1 1
 ---
2
-- name:  Deploy the overcloud
2
+- name: Deploy the overcloud
3 3
   hosts: undercloud
4
-  gather_facts: no
4
+  gather_facts: false
5 5
   roles:
6 6
     - overcloud-deploy
7 7
   tags:
8 8
     - overcloud-deploy
9 9
 
10 10
 # Add the overcloud nodes to the generated inventory.
11
-- name:  Inventory the overcloud
11
+- name: Inventory the overcloud
12 12
   hosts: undercloud
13
-  gather_facts: yes
13
+  gather_facts: true
14 14
   tags:
15 15
     - overcloud-deploy
16 16
   vars:
17
-      inventory: all
17
+    inventory: all
18 18
   roles:
19 19
     - tripleo-inventory
20 20
 
21
-- name:  Check the result of the deployment
21
+- name: Check the result of the deployment
22 22
   hosts: localhost
23 23
   tags:
24 24
     - overcloud-deploy
@@ -33,12 +33,11 @@
33 33
 
34 34
 - name: Run tripleo-validations post-deployment tests
35 35
   hosts: undercloud
36
-  gather_facts: no
36
+  gather_facts: false
37 37
   tags:
38 38
     - tripleo-validations
39 39
   vars:
40 40
     validations_group: ['post-deployment']
41 41
   roles:
42
-    - { role: tripleo-validations,
43
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
44
-
42
+    - {role: tripleo-validations,
43
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

+ 10
- 10
playbooks/baremetal-full-undercloud.yml View File

@@ -1,7 +1,7 @@
1 1
 ---
2
-- name:  Deploy the undercloud
2
+- name: Deploy the undercloud
3 3
   hosts: undercloud
4
-  gather_facts: yes
4
+  gather_facts: true
5 5
   roles:
6 6
     - undercloud-deploy
7 7
   tags:
@@ -9,28 +9,28 @@
9 9
 
10 10
 - name: Configure tripleo-validations
11 11
   hosts: undercloud
12
-  gather_facts: no
12
+  gather_facts: false
13 13
   tags:
14 14
     - tripleo-validations
15 15
   vars:
16
-    run_tripleo_validations_setup: True
16
+    run_tripleo_validations_setup: true
17 17
   roles:
18
-    - { role: tripleo-validations,
19
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
18
+    - {role: tripleo-validations,
19
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
20 20
 
21 21
 - name: Validate the undercloud
22 22
   hosts: undercloud
23 23
   roles:
24
-    - { role: validate-undercloud,
25
-        when: run_validate_undercloud|default(false)|bool }
24
+    - {role: validate-undercloud,
25
+       when: run_validate_undercloud|default(false)|bool}
26 26
   tags:
27 27
     - validate-undercloud
28 28
 
29 29
 - name: Build images for quickstart
30 30
   hosts: undercloud
31
-  gather_facts: no
31
+  gather_facts: false
32 32
   roles:
33
-    - { role: build-images, when: to_build|default(false)|bool }
33
+    - {role: build-images, when: to_build|default(false)|bool}
34 34
   tags:
35 35
     - get-images
36 36
     - images

+ 6
- 7
playbooks/baremetal-prep-virthost.yml View File

@@ -34,25 +34,24 @@
34 34
   roles:
35 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 38
   hosts: virthost
39
-  gather_facts: yes
39
+  gather_facts: true
40 40
   roles:
41 41
     - libvirt/setup
42 42
 
43 43
 # Add the undercloud node to the generated
44 44
 # inventory.
45
-- name:  Inventory the undercloud
45
+- name: Inventory the undercloud
46 46
   hosts: localhost
47
-  gather_facts: yes
47
+  gather_facts: true
48 48
   vars:
49
-      inventory: undercloud
49
+    inventory: undercloud
50 50
   roles:
51 51
     - tripleo-inventory
52 52
 
53 53
 - name: Prepare the host for PXE forwarding
54 54
   hosts: virthost
55
-  gather_facts: no
55
+  gather_facts: false
56 56
   roles:
57 57
     - baremetal-prep-virthost
58
-

+ 4
- 4
playbooks/baremetal-undercloud.yml View File

@@ -8,7 +8,7 @@
8 8
 
9 9
 - name: Add the undercloud node to the generated inventory
10 10
   hosts: localhost
11
-  gather_facts: yes
11
+  gather_facts: true
12 12
   roles:
13 13
     - tripleo-inventory
14 14
   tags:
@@ -16,7 +16,7 @@
16 16
 
17 17
 - name: Setup repositories
18 18
   hosts: undercloud
19
-  gather_facts: yes
19
+  gather_facts: true
20 20
   roles:
21 21
     - repo-setup
22 22
   tags:
@@ -24,7 +24,7 @@
24 24
 
25 25
 - name: Install packages
26 26
   hosts: undercloud
27
-  gather_facts: no
27
+  gather_facts: false
28 28
   roles:
29 29
     - baremetal-undercloud/packages
30 30
   tags:
@@ -32,7 +32,7 @@
32 32
 
33 33
 - name: Fetch the overcloud images
34 34
   hosts: undercloud
35
-  gather_facts: no
35
+  gather_facts: false
36 36
   roles:
37 37
     - fetch-images
38 38
   tags:

+ 2
- 2
playbooks/build-images-v2.yml View File

@@ -13,9 +13,9 @@
13 13
   tags:
14 14
     - provision
15 15
 
16
-- name:  Inventory the virthost
16
+- name: Inventory the virthost
17 17
   hosts: localhost
18
-  gather_facts: yes
18
+  gather_facts: true
19 19
   roles:
20 20
     - tripleo-inventory
21 21
   tags:

+ 2
- 2
playbooks/build-test-packages.yml View File

@@ -13,9 +13,9 @@
13 13
   tags:
14 14
     - provision
15 15
 
16
-- name:  Inventory the virthost
16
+- name: Inventory the virthost
17 17
   hosts: localhost
18
-  gather_facts: yes
18
+  gather_facts: true
19 19
   roles:
20 20
     - tripleo-inventory
21 21
   tags:

+ 2
- 2
playbooks/cleanup-destructive.yml View File

@@ -10,8 +10,8 @@
10 10
         ansible_user: "root"
11 11
         ansible_host: "{{ virthost }}"
12 12
 
13
-- name:  Clean up tripleo packages and libvirt
13
+- name: Clean up tripleo packages and libvirt
14 14
   hosts: virthost
15
-  gather_facts: no
15
+  gather_facts: false
16 16
   roles:
17 17
     - virthost-full-cleanup

+ 4
- 4
playbooks/collect-logs.yml View File

@@ -6,14 +6,14 @@
6 6
 
7 7
 - name: Ensure the overcloud nodes are added to the generated inventory
8 8
   hosts: undercloud
9
-  gather_facts: yes
9
+  gather_facts: true
10 10
   tags:
11 11
     - collect-logs
12 12
   vars:
13
-      inventory: all
13
+    inventory: all
14 14
   roles:
15 15
     - tripleo-inventory
16
-  ignore_errors: yes
16
+  ignore_errors: true
17 17
 
18 18
 - name: Collect logs
19 19
   hosts: all:!localhost:!127.0.0.2
@@ -23,4 +23,4 @@
23 23
 - name: Create docs, publish logs
24 24
   hosts: localhost
25 25
   roles:
26
-    - {role: collect-logs, artcl_collect: false }
26
+    - {role: collect-logs, artcl_collect: false}

+ 5
- 4
playbooks/deploy-delete.yml View File

@@ -1,15 +1,16 @@
1
+---
1 2
 # This is the playbook used by the `quickstart.sh` script.
2 3
 
3 4
 - include: quickstart-extras.yml
4 5
 
5 6
 - name: Collect logs, create docs, publish
6 7
   hosts: all:!localhost
7
-  gather_facts: no
8
+  gather_facts: false
8 9
   roles:
9
-    - { role: tripleo-collect-logs, artcl_collect: true }
10
+    - {role: tripleo-collect-logs, artcl_collect: true}
10 11
 
11 12
 - name: test overcloud deletion
12 13
   hosts: undercloud
13
-  gather_facts: no
14
+  gather_facts: false
14 15
   roles:
15
-    - { role: overcloud-delete }
16
+    - {role: overcloud-delete}

+ 13
- 10
playbooks/multinode-overcloud-prep.yml View File

@@ -1,7 +1,7 @@
1 1
 ---
2 2
 - name: Run overcloud prep config
3 3
   hosts: undercloud
4
-  gather_facts: no
4
+  gather_facts: false
5 5
   roles:
6 6
     - role: overcloud-prep-config
7 7
       # only run when we know we have to, save time otherwise
@@ -11,24 +11,27 @@
11 11
 
12 12
 - name: Run overcloud prep roles
13 13
   hosts: undercloud
14
-  gather_facts: no
14
+  gather_facts: false
15 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 21
 - name: Run tripleo-validations pre-introspection tests
19 22
   hosts: undercloud
20
-  gather_facts: no
23
+  gather_facts: false
21 24
   tags:
22 25
     - tripleo-validations
23 26
   vars:
24 27
     validations_group: ['pre-introspection']
25 28
   roles:
26
-    - { role: tripleo-validations,
27
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
29
+    - {role: tripleo-validations,
30
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
28 31
 
29 32
 - name: Prepare for containerized deployment
30 33
   hosts: undercloud
31
-  gather_facts: no
34
+  gather_facts: false
32 35
   tags:
33 36
     - overcloud-prep-containers
34 37
   roles:
@@ -38,11 +41,11 @@
38 41
 
39 42
 - name: Run tripleo-validations pre-deployment tests
40 43
   hosts: undercloud
41
-  gather_facts: no
44
+  gather_facts: false
42 45
   tags:
43 46
     - tripleo-validations
44 47
   vars:
45 48
     validations_group: ['pre-deployment']
46 49
   roles:
47
-    - { role: tripleo-validations,
48
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
50
+    - {role: tripleo-validations,
51
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

+ 2
- 1
playbooks/multinode-overcloud-update.yml View File

@@ -1,6 +1,7 @@
1
+---
1 2
 - name: Run tripleo-upgrade role to update the overcloud
2 3
   hosts: undercloud
3
-  gather_facts: yes
4
+  gather_facts: true
4 5
   tags:
5 6
     - overcloud-update
6 7
   roles:

+ 4
- 3
playbooks/multinode-overcloud-upgrade.yml View File

@@ -1,8 +1,9 @@
1
+---
1 2
 - name: Generate repo-setup script for overcloud upgrade
2 3
   hosts: undercloud
3 4
   tags:
4 5
     - overcloud-upgrade
5
-  gather_facts: no
6
+  gather_facts: false
6 7
   vars:
7 8
     repo_run_live: false
8 9
     repo_setup_script: "repo-setup-{{ target_upgrade_version }}.sh"
@@ -18,7 +19,7 @@
18 19
 
19 20
 - name: Prepare containers for Upgrade
20 21
   hosts: undercloud
21
-  gather_facts: no
22
+  gather_facts: false
22 23
   tags:
23 24
     - overcloud-prep-containers
24 25
   roles:
@@ -35,7 +36,7 @@
35 36
 
36 37
 - name: Run tripleo-upgrade role to upgrade overcloud
37 38
   hosts: undercloud
38
-  gather_facts: yes
39
+  gather_facts: true
39 40
   tags:
40 41
     - overcloud-upgrade
41 42
   vars:

+ 4
- 5
playbooks/multinode-overcloud.yml View File

@@ -1,7 +1,7 @@
1 1
 ---
2 2
 - name: Deploy the overcloud
3 3
   hosts: undercloud
4
-  gather_facts: no
4
+  gather_facts: false
5 5
   roles:
6 6
     - overcloud-deploy
7 7
   environment:
@@ -22,12 +22,11 @@
22 22
 
23 23
 - name: Run tripleo-validations post-deployment tests
24 24
   hosts: undercloud
25
-  gather_facts: no
25
+  gather_facts: false
26 26
   tags:
27 27
     - tripleo-validations
28 28
   vars:
29 29
     validations_group: ['post-deployment']
30 30
   roles:
31
-    - { role: tripleo-validations,
32
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
33
-
31
+    - {role: tripleo-validations,
32
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

+ 3
- 3
playbooks/multinode-standalone-upgrade.yml View File

@@ -41,7 +41,7 @@
41 41
     artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
42 42
   roles:
43 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 45
   tags:
46 46
     - standalone-upgrade
47 47
 
@@ -56,8 +56,8 @@
56 56
 
57 57
 - name: Validate the Standalone upgrade
58 58
   hosts: undercloud
59
-  gather_facts: no
59
+  gather_facts: false
60 60
   roles:
61
-    - { role: validate-tempest, when: run_tempest|bool }
61
+    - {role: validate-tempest, when: run_tempest|bool}
62 62
   tags:
63 63
     - standalone-upgrade

+ 4
- 4
playbooks/multinode-standalone.yml View File

@@ -1,7 +1,7 @@
1 1
 ---
2 2
 - name: Add the overcloud nodes to the generated inventory
3 3
   hosts: undercloud
4
-  gather_facts: yes
4
+  gather_facts: true
5 5
   tags:
6 6
     - standalone
7 7
   vars:
@@ -22,7 +22,7 @@
22 22
     artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
23 23
   roles:
24 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 26
   tags:
27 27
     - build
28 28
 
@@ -44,8 +44,8 @@
44 44
 
45 45
 - name: Validate the undercloud
46 46
   hosts: undercloud
47
-  gather_facts: no
47
+  gather_facts: false
48 48
   roles:
49
-    - { role: validate-tempest, when: run_tempest|bool }
49
+    - {role: validate-tempest, when: run_tempest|bool}
50 50
   tags:
51 51
     - standalone

+ 6
- 6
playbooks/multinode-undercloud.yml View File

@@ -1,7 +1,7 @@
1 1
 ---
2 2
 - name: Add the overcloud nodes to the generated inventory
3 3
   hosts: undercloud
4
-  gather_facts: yes
4
+  gather_facts: true
5 5
   tags:
6 6
     - overcloud-deploy
7 7
   vars:
@@ -47,7 +47,7 @@
47 47
     artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
48 48
   roles:
49 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 51
   tags:
52 52
     - build
53 53
 
@@ -71,14 +71,14 @@
71 71
 
72 72
 - name: Configure tripleo-validations
73 73
   hosts: undercloud
74
-  gather_facts: no
74
+  gather_facts: false
75 75
   tags:
76 76
     - tripleo-validations
77 77
   vars:
78
-    run_tripleo_validations_setup: True
78
+    run_tripleo_validations_setup: true
79 79
   roles:
80
-    - { role: tripleo-validations,
81
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
80
+    - {role: tripleo-validations,
81
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
82 82
 
83 83
 - name: Validate the undercloud
84 84
   hosts: undercloud

+ 6
- 6
playbooks/multinode-validate.yml View File

@@ -4,17 +4,17 @@
4 4
   tags:
5 5
     - overcloud-validate
6 6
   roles:
7
-    - { role: validate-perf,
8
-        when: validate_performance|bool and run_tempest|bool }
7
+    - {role: validate-perf,
8
+       when: validate_performance|bool and run_tempest|bool}
9 9
   ignore_errors: true
10 10
 
11 11
 # Validate the deployment
12
-- name:  validate the overcloud
12
+- name: validate the overcloud
13 13
   hosts: undercloud
14 14
   tags:
15 15
     - overcloud-validate
16 16
     - undercloud-validate
17
-  gather_facts: no
17
+  gather_facts: false
18 18
   roles:
19
-    - { role: validate-simple, when: test_ping|bool }
20
-    - { role: validate-tempest, when: run_tempest|bool }
19
+    - {role: validate-simple, when: test_ping|bool}
20
+    - {role: validate-tempest, when: run_tempest|bool}

+ 2
- 2
playbooks/nodepool-setup.yml View File

@@ -1,7 +1,7 @@
1
+---
1 2
 # setup the nodepool nodes
2 3
 - name: Setup the provisioned virtual machines to look like nodepool nodes
3 4
   hosts: subnodes
4
-  gather_facts: yes
5
+  gather_facts: true
5 6
   roles:
6 7
     - nodepool-setup
7
-

+ 29
- 15
playbooks/ovb-setup.yml View File

@@ -5,28 +5,28 @@
5 5
 - include: prepare-slave.yml
6 6
   when: use_testenv_broker|default(false)|bool
7 7
 
8
-- name:  Inventory the undercloud instance
8
+- name: Inventory the undercloud instance
9 9
   hosts: localhost
10
-  gather_facts: yes
10
+  gather_facts: true
11 11
   roles:
12 12
     - tripleo-inventory
13 13
 
14 14
 - name: Setup the undercloud
15 15
   hosts: undercloud
16
-  gather_facts: yes
16
+  gather_facts: true
17 17
   roles:
18 18
     - undercloud-setup
19 19
   tasks:
20 20
     - name: Add eth2 interface from eth2.conf
21 21
       command: os-net-config -c {{ working_dir }}/eth2.conf -v
22
-      become: yes
22
+      become: true
23 23
       when:
24 24
         - network_isolation|bool
25 25
         - use_testenv_broker|default(false)|bool
26 26
 
27
-- name:  Inventory the undercloud instance
27
+- name: Inventory the undercloud instance
28 28
   hosts: localhost
29
-  gather_facts: yes
29
+  gather_facts: true
30 30
   roles:
31 31
     - tripleo-inventory
32 32
 
@@ -42,14 +42,14 @@
42 42
     artg_repos_dir: "{{ repo_clone_dir|default('/opt/stack/new') }}"
43 43
     ib_create_web_repo: "{{ to_build|bool }}"
44 44
   roles:
45
-    - { role: build-test-packages, when: build_test_packages|default(false)|bool }
46
-    - { role: install-built-repo, when: compressed_gating_repo is defined }
45
+    - {role: build-test-packages, when: build_test_packages|default(false)|bool}
46
+    - {role: install-built-repo, when: compressed_gating_repo is defined}
47 47
   tags:
48 48
     - build
49 49
 
50 50
 - name: Get images for quickstart
51 51
   hosts: undercloud
52
-  gather_facts: no
52
+  gather_facts: false
53 53
   vars:
54 54
     ib_repo_image_inject: "{{ not to_build|bool }}"
55 55
     ib_repo_run_live: false
@@ -57,9 +57,23 @@
57 57
     modify_image_vc_cpu: 4
58 58
     modify_image_vc_verbose: true
59 59
   roles:
60
-    - { role: fetch-images, when: not to_build|bool }
61
-    - { role: repo-setup, repo_inject_image_path: "$HOME/overcloud-full.qcow2", repo_run_live: false, 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 }
63
-    - { role: install-built-repo, ib_repo_image_path: "$HOME/overcloud-full.qcow2", when: compressed_gating_repo is defined and not to_build|bool }
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 }
65
-
60
+    - {role: fetch-images,
61
+       when: not to_build|bool}
62
+    - {role: repo-setup,
63
+       repo_inject_image_path: "$HOME/overcloud-full.qcow2",
64
+       repo_run_live: false,
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}

+ 1
- 1
playbooks/provision_multinodes.yml View File

@@ -1,6 +1,6 @@
1 1
 ---
2 2
 - name: Multinode
3 3
   hosts: localhost
4
-  gather_facts: no
4
+  gather_facts: false
5 5
   roles:
6 6
     - role: multinodes

+ 19
- 18
playbooks/quickstart-extras-overcloud-prep.yml View File

@@ -1,25 +1,26 @@
1
+---
1 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 4
   hosts: undercloud
4
-  gather_facts: no
5
+  gather_facts: false
5 6
   tags:
6 7
     - overcloud-prep-config
7 8
   roles:
8 9
     - overcloud-prep-config
9 10
 
10 11
 # Prepare the overcloud for a containerized deployment
11
-- name:  Prepare overcloud containers
12
+- name: Prepare overcloud containers
12 13
   hosts: undercloud
13
-  gather_facts: no
14
+  gather_facts: false
14 15
   tags:
15 16
     - overcloud-prep-containers
16 17
   roles:
17 18
     - overcloud-prep-containers
18 19
 
19 20
 # Prepare the overcloud images for deployment
20
-- name:  Prepare the overcloud images for deployment
21
+- name: Prepare the overcloud images for deployment
21 22
   hosts: undercloud
22
-  gather_facts: no
23
+  gather_facts: false
23 24
   tags:
24 25
     - overcloud-prep-images
25 26
   roles:
@@ -27,28 +28,28 @@
27 28
 
28 29
 - name: Run tripleo-validations pre-introspection tests
29 30
   hosts: undercloud
30
-  gather_facts: no
31
+  gather_facts: false
31 32
   tags:
32 33
     - tripleo-validations
33 34
   vars:
34 35
     validations_group: ['pre-introspection']
35 36
   roles:
36
-    - { role: tripleo-validations,
37
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
37
+    - {role: tripleo-validations,
38
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
38 39
 
39 40
 # Prepare the overcloud flavor configuration
40
-- name:  Prepare overcloud flavors
41
+- name: Prepare overcloud flavors
41 42
   hosts: undercloud
42
-  gather_facts: no
43
+  gather_facts: false
43 44
   tags:
44 45
     - overcloud-prep-flavors
45 46
   roles:
46 47
     - overcloud-prep-flavors
47 48
 
48 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 51
   hosts: undercloud
51
-  gather_facts: no
52
+  gather_facts: false
52 53
   tags:
53 54
     - overcloud-prep-network
54 55
   roles:
@@ -56,20 +57,20 @@
56 57
 
57 58
 - name: Run tripleo-validations pre-deployment tests
58 59
   hosts: undercloud
59
-  gather_facts: no
60
+  gather_facts: false
60 61
   tags:
61 62
     - tripleo-validations
62 63
   vars:
63 64
     validations_group: ['pre-deployment']
64 65
   roles:
65
-    - { role: tripleo-validations,
66
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
66
+    - {role: tripleo-validations,
67
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
67 68
 
68 69
 - name: Prepare the SSL Configuration for the overcloud deployment
69 70
   hosts: undercloud
70
-  gather_facts: no
71
+  gather_facts: false
71 72
   tags:
72 73
     - overcloud-scripts
73 74
     - overcloud-ssl
74 75
   roles:
75
-    - { role: overcloud-ssl }
76
+    - {role: overcloud-ssl}

+ 9
- 8
playbooks/quickstart-extras-overcloud.yml View File

@@ -1,7 +1,8 @@
1
+---
1 2
 # Deploy the overcloud
2
-- name:  Deploy the overcloud
3
+- name: Deploy the overcloud
3 4
   hosts: undercloud
4
-  gather_facts: yes
5
+  gather_facts: true
5 6
   tags:
6 7
     - overcloud-deploy
7 8
   roles:
@@ -9,28 +10,28 @@
9 10
 
10 11
 - name: Add the overcloud nodes to the generated inventory
11 12
   hosts: undercloud
12
-  gather_facts: yes
13
+  gather_facts: true
13 14
   tags:
14 15
     - overcloud-deploy
15 16
     - overcloud-inventory
16 17
   vars:
17
-      inventory: all
18
+    inventory: all
18 19
   roles:
19 20
     - tripleo-inventory
20 21
 
21 22
 - name: Run tripleo-validations post-deployment tests
22 23
   hosts: undercloud
23
-  gather_facts: no
24
+  gather_facts: false
24 25
   tags:
25 26
     - tripleo-validations
26 27
   vars:
27 28
     validations_group: ['post-deployment']
28 29
   roles:
29
-    - { role: tripleo-validations,
30
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
30
+    - {role: tripleo-validations,
31
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
31 32
 
32 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 35
   hosts: localhost
35 36
   tags:
36 37
     - overcloud-deploy

+ 11
- 11
playbooks/quickstart-extras-undercloud.yml View File

@@ -1,27 +1,28 @@
1
+---
1 2
 # Deploy the FreeIPA server
2 3
 - name: Deploy the FreeIPA server
3 4
   hosts: supplemental
4
-  gather_facts: no
5
+  gather_facts: false
5 6
   tags:
6 7
     - freeipa-setup
7 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 11
 # setup for the undercloud
11 12
 - name: Setup the undercloud
12 13
   hosts: undercloud
13
-  gather_facts: no
14
+  gather_facts: false
14 15
   vars:
15 16
     ansible_user: root
16 17
   tags:
17 18
     - undercloud-setup
18 19
   roles:
19
-    - { role: undercloud-setup, when: undercloud_setup|bool }
20
+    - {role: undercloud-setup, when: undercloud_setup|bool}
20 21
 
21 22
 # Deploy the undercloud
22
-- name:  Deploy the undercloud
23
+- name: Deploy the undercloud
23 24
   hosts: undercloud
24
-  gather_facts: no
25
+  gather_facts: false
25 26
   tags:
26 27
     - undercloud-deploy
27 28
   roles:
@@ -29,12 +30,11 @@
29 30
 
30 31
 - name: Configure tripleo-validations
31 32
   hosts: undercloud
32
-  gather_facts: no
33
+  gather_facts: false
33 34
   tags:
34 35
     - tripleo-validations
35 36
   vars:
36
-    run_tripleo_validations_setup: True
37
+    run_tripleo_validations_setup: true
37 38
   roles:
38
-    - { role: tripleo-validations,
39
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
40
-
39
+    - {role: tripleo-validations,
40
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

+ 12
- 11
playbooks/quickstart-extras-validate.yml View File

@@ -1,35 +1,36 @@
1
+---
1 2
 # Validate the deployment
2 3
 - name: setup dstat performance monitoring
3 4
   hosts: overcloud
4 5
   tags:
5 6
     - overcloud-validate
6 7
   roles:
7
-    - { role: validate-perf,
8
-        when: validate_performance|bool and run_tempest|bool }
8
+    - {role: validate-perf,
9
+       when: validate_performance|bool and run_tempest|bool}
9 10
   ignore_errors: true
10 11
 
11
-- name:  validate the overcloud
12
+- name: validate the overcloud
12 13
   hosts: undercloud
13 14
   tags:
14 15
     - overcloud-validate
15
-  gather_facts: no
16
+  gather_facts: false
16 17
   roles:
17
-    - { role: validate-simple, when: test_ping|bool }
18
+    - {role: validate-simple, when: test_ping|bool}
18 19
 
19 20
 # Execute tempest against the overcloud deployment
20
-- name:  Execute tempest against the overcloud
21
+- name: Execute tempest against the overcloud
21 22
   hosts: undercloud
22 23
   tags:
23 24
     - overcloud-validate
24
-  gather_facts: no
25
+  gather_facts: false
25 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 29
 # Execute simple TripleO-UI validations
29
-- name:  Execute simple TripleO-UI validations
30
+- name: Execute simple TripleO-UI validations
30 31
   hosts: localhost
31 32
   tags:
32 33
     - tripleoui-validate
33
-  gather_facts: yes
34
+  gather_facts: true
34 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}

+ 2
- 2
playbooks/repo-setup.yml View File

@@ -1,6 +1,6 @@
1 1
 ---
2
-- name:  Setup repositories
2
+- name: Setup repositories
3 3
   hosts: undercloud
4
-  gather_facts: yes
4
+  gather_facts: true
5 5
   roles:
6 6
     - repo-setup

+ 2
- 2
playbooks/scale_nodes_verify.yml View File

@@ -7,7 +7,7 @@
7 7
 # Re-inventory the overcloud
8 8
 - name: Inventory the overcloud
9 9
   hosts: undercloud
10
-  gather_facts: yes
10
+  gather_facts: true
11 11
   vars:
12 12
     inventory: all
13 13
   roles:
@@ -16,6 +16,6 @@
16 16
 # Validate the overcloud
17 17
 - name: Validate the overcloud post-delete-node
18 18
   hosts: undercloud
19
-  gather_facts: no
19
+  gather_facts: false
20 20
   roles:
21 21
     - validate-simple

+ 4
- 5
playbooks/snapshot-libvirt.yml View File

@@ -1,13 +1,12 @@
1 1
 ---
2
-- name:  Snapshot virts
2
+- name: Snapshot virts
3 3
   hosts: virthost
4
-  gather_facts: yes
4
+  gather_facts: true
5 5
   vars:
6 6
     - libvirt_uri: qemu:///system
7 7
     - overcloud_nodes:
8
-      - name: subnode-0
9
-      - name: subnode-1
8
+        - name: subnode-0
9
+        - name: subnode-1
10 10
   roles:
11 11
     - snapshot-libvirt
12 12
   become: true
13
-

+ 2
- 2
playbooks/tempest.yml View File

@@ -1,6 +1,6 @@
1 1
 ---
2
-- name:  Run tempest
2
+- name: Run tempest
3 3
   hosts: undercloud
4
-  gather_facts: no
4
+  gather_facts: false
5 5
   roles:
6 6
     - validate-tempest

+ 7
- 8
playbooks/tripleo-validations.yml View File

@@ -2,23 +2,22 @@
2 2
 
3 3
 - name: Configure tripleo-validations
4 4
   hosts: undercloud
5
-  gather_facts: no
5
+  gather_facts: false
6 6
   tags:
7 7
     - tripleo-validations
8 8
   vars:
9
-    run_tripleo_validations_setup: True
9
+    run_tripleo_validations_setup: true
10 10
   roles:
11
-    - { role: tripleo-validations,
12
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
11
+    - {role: tripleo-validations,
12
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
13 13
 
14 14
 - name: Run tripleo-validations pre-introspection tests
15 15
   hosts: undercloud
16
-  gather_facts: no
16
+  gather_facts: false
17 17
   tags:
18 18
     - tripleo-validations
19 19
   vars:
20 20
     validations_group: ['pre-introspection']
21 21
   roles:
22
-    - { role: tripleo-validations,
23
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
24
-
22
+    - {role: tripleo-validations,
23
+       when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

+ 1
- 1
roles/baremetal-prep-overcloud/README.md View File

@@ -34,7 +34,7 @@ Example Playbook
34 34
 
35 35
     - name: Prepare for deployment on baremetal overcloud
36 36
       hosts: virthost
37
-      gather_facts: no
37
+      gather_facts: false
38 38
       roles:
39 39
         - ansible-role-tripleo-overcloud-prep-baremetal
40 40
 

+ 1
- 3
roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml View File

@@ -7,9 +7,7 @@
7 7
     mode: 0755
8 8
 
9 9
 - name: Adjust MTU values and modify dnsmasq-ironic.conf
10
-  become: yes
10
+  become: true
11 11
   shell: >
12 12
     "{{ working_dir }}"/adjust-interface-mtus.sh
13 13
   when: step_adjust_mtu|bool
14
-
15
-

+ 1
- 1
roles/baremetal-prep-overcloud/tasks/allow-traffic-for-controller.yml View File

@@ -7,7 +7,7 @@
7 7
     mode: 0755
8 8
 
9 9
 - name: Allow traffic for the controller
10
-  become: yes
10
+  become: true
11 11
   shell: >
12 12
     "{{ working_dir }}"/allow-traffic-for-controller.sh
13 13
   when:

+ 1
- 1
roles/baremetal-prep-virthost/README.md View File

@@ -32,7 +32,7 @@ Example Playbook
32 32
 
33 33
     - name: Prepare the host for PXE forwarding
34 34
       hosts: virthost
35
-      gather_facts: no
35
+      gather_facts: false
36 36
       roles:
37 37
         - ansible-role-tripleo-baremetal-prep-virthost
38 38
 

+ 1
- 1
roles/baremetal-prep-virthost/tasks/main.yml View File

@@ -9,6 +9,6 @@
9 9
   wait_for: path="{{ working_dir }}/add-provisioning-interface.sh"
10 10
 
11 11
 - name: Add provisioning interface to the "brovc" bridge
12
-  become: yes
12
+  become: true
13 13
   shell: >
14 14
     "{{ working_dir }}"/add-provisioning-interface.sh

+ 8
- 8
roles/baremetal-undercloud/README.md View File

@@ -219,7 +219,7 @@ others coming from various related to tripleo-quickstart:
219 219
 # Machine at this point is provided
220 220
 - name: Add the undercloud node to the generated inventory
221 221
   hosts: localhost
222
-  gather_facts: yes
222
+  gather_facts: true
223 223
   roles:
224 224
     - tripleo-inventory
225 225
   tags:
@@ -228,7 +228,7 @@ others coming from various related to tripleo-quickstart:
228 228
 # Deploy the undercloud
229 229
 - name: Install undercloud
230 230
   hosts: undercloud
231
-  gather_facts: no
231
+  gather_facts: false
232 232
   roles:
233 233
     - tripleo/undercloud
234 234
   tags:
@@ -245,7 +245,7 @@ others coming from various related to tripleo-quickstart:
245 245
 # Prepare any additional configuration files required by the overcloud
246 246
 - name: Prepare configuration files for the overcloud deployment
247 247
   hosts: undercloud
248
-  gather_facts: no
248
+  gather_facts: false
249 249
   roles:
250 250
     - overcloud-prep-config
251 251
   tags:
@@ -254,7 +254,7 @@ others coming from various related to tripleo-quickstart:
254 254
 # Prepare the overcloud images for deployment
255 255
 - name: Prepare the overcloud images for deployment
256 256
   hosts: undercloud
257
-  gather_facts: no
257
+  gather_facts: false
258 258
   roles:
259 259
     - overcloud-prep-images
260 260
   tags:
@@ -263,7 +263,7 @@ others coming from various related to tripleo-quickstart:
263 263
 # Prepare the overcloud flavor configuration
264 264
 - name: Prepare overcloud flavors
265 265
   hosts: undercloud
266
-  gather_facts: no
266
+  gather_facts: false
267 267
   roles:
268 268
     - overcloud-prep-flavors
269 269
   tags:
@@ -272,7 +272,7 @@ others coming from various related to tripleo-quickstart:
272 272
 # Prepare the undercloud networks for the overcloud deployment
273 273
 - name: Prepare the undercloud networks for the overcloud deployment
274 274
   hosts: undercloud
275
-  gather_facts: no
275
+  gather_facts: false
276 276
   roles:
277 277
     - overcloud-prep-network
278 278
   tags:
@@ -281,7 +281,7 @@ others coming from various related to tripleo-quickstart:
281 281
 # Deploy the overcloud
282 282
 - name: Deploy the overcloud
283 283
   hosts: undercloud
284
-  gather_facts: yes
284
+  gather_facts: true
285 285
   roles:
286 286
     - overcloud-deploy
287 287
   tags:
@@ -289,7 +289,7 @@ others coming from various related to tripleo-quickstart:
289 289
 
290 290
 - name: Add the overcloud nodes to the generated inventory
291 291
   hosts: undercloud
292
-  gather_facts: yes
292
+  gather_facts: true
293 293
   vars:
294 294
       inventory: all
295 295
   roles:

+ 29
- 27
roles/build-test-packages/tasks/main.yml View File

@@ -18,32 +18,32 @@
18 18
   when: python_cmd is not defined
19 19
 
20 20
 - name: Ensure DLRN package dependencies
21
-  become: yes
21
+  become: true
22 22
   package:
23 23
     state: present
24 24
     name:
25
-        - createrepo
26
-        - gcc
27
-        - git
28
-        - libffi-devel
29
-        - mock
30
-        - openssl-devel
31
-        - redhat-rpm-config
32
-        - rsync
33
-        - rpm-build
34
-        - rpmdevtools
35
-        - sqlite
36
-        - >
37
-            {% if ansible_python.version.major == 3 %}
38
-            python3-libselinux
39
-            {% else %}
40
-            libselinux-python
41
-            {% endif %}
25
+      - createrepo
26
+      - gcc
27
+      - git
28
+      - libffi-devel
29
+      - mock
30
+      - openssl-devel
31
+      - redhat-rpm-config
32
+      - rsync
33
+      - rpm-build
34
+      - rpmdevtools
35
+      - sqlite
36
+      - >
37
+        {% if ansible_python.version.major == 3 %}
38
+        python3-libselinux
39
+        {% else %}
40
+        libselinux-python
41
+        {% endif %}
42 42
 
43 43
 - name: Check if virtualenv is in the system
44 44
   shell: "{{ python_cmd }} -m virtualenv --version"
45 45
   args:
46
-    warn: no
46
+    warn: false
47 47
   register: virtualenv_exist
48 48
   changed_when: false
49 49
   failed_when: false
@@ -60,17 +60,17 @@
60 60
         {% endif %}
61 61
 
62 62
 - name: Create mock group
63
-  become: yes
63
+  become: true
64 64
   group:
65 65
     name: mock
66 66
     state: present
67 67
 
68 68
 - name: Add user to mock group
69
-  become: yes
69
+  become: true
70 70
   user:
71 71
     name: '{{ ansible_user_id }}'
72 72
     groups: mock
73
-    append: yes
73
+    append: true
74 74
 
75 75
 - name: Ensure DLRN dir is present
76 76
   file:
@@ -81,7 +81,7 @@
81 81
   shell:
82 82
     rm -rf '{{ build_repo_dir }}/DLRN/*'
83 83
   args:
84
-    warn: no
84
+    warn: false
85 85
   register: result
86 86
   changed_when: result.stdout or result.stderr
87 87
 
@@ -117,7 +117,7 @@
117 117
     pip install -r requirements.txt;
118 118
     python setup.py install;
119 119
   args:
120
-      chdir: '{{ build_repo_dir }}/DLRN'
120
+    chdir: '{{ build_repo_dir }}/DLRN'
121 121
   when: dlrn_pre_installed|bool
122 122
 
123 123
 - name: copy the DLRN scripts in the virtualenv to the scripts dir
@@ -138,8 +138,10 @@
138 138
     gawk '{ print $0 }; /^# repos$/ { exit }' {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}.cfg
139 139
     > {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
140 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;
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;
141
+    find /etc/yum.repos.d -name "delorean*repo" ! -name "delorean*build-deps.repo" -exec cat {} \;
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 145
     echo '"""' >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
144 146
     mkdir -p /tmp/fake-dlrn-repos/current;
145 147
     touch /tmp/fake-dlrn-repos/delorean-deps.repo;
@@ -224,7 +226,7 @@
224 226
         exit $?;
225 227
     done;
226 228
   args:
227
-      chdir: '{{ build_repo_dir }}/DLRN'
229
+    chdir: '{{ build_repo_dir }}/DLRN'
228 230
   register: repo_built_multi
229 231
   when: not artg_build_one|bool
230 232
 

+ 1
- 1
roles/collect-logs/tasks/ara_influxdb.yml View File

@@ -16,7 +16,7 @@
16 16
     only_successful_tasks: "{{ influxdb_only_successful_tasks }}"
17 17
 
18 18
 - name: Get ARA json data for undercloud
19
-  become: yes
19
+  become: true
20 20
   shell: "{{ local_working_dir }}/bin/ara result list --all -f json"
21 21
   register: ara_root_data
22 22
 

+ 5
- 5
roles/collect-logs/tasks/collect.yml View File

@@ -306,7 +306,7 @@
306 306
     dest: "/tmp/{{ inventory_hostname }}-rsync-filter"
307 307
 
308 308
 - name: Gather the logs to /tmp
309
-  become: yes
309
+  become: true
310 310
   shell: >
311 311
     set -o pipefail &&
312 312
     rsync --quiet --recursive --copy-links --prune-empty-dirs
@@ -333,16 +333,16 @@
333 333
   fetch:
334 334
     src: "/tmp/{{ inventory_hostname }}.tar.gz"
335 335
     dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar.gz"
336
-    flat: yes
337
-    validate_checksum: no
336
+    flat: true
337
+    validate_checksum: false
338 338
   when: artcl_tar_gz|bool
339 339
 
340 340
 - name: Fetch log archive (tar)
341 341
   fetch:
342 342
     src: "/tmp/{{ inventory_hostname }}.tar"
343 343
     dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar"
344
-    flat: yes
345
-    validate_checksum: no
344
+    flat: true
345
+    validate_checksum: false
346 346
   when: artcl_gzip_only|bool
347 347
 
348 348
 - name: Delete temporary log directory after collection

+ 6
- 6
roles/collect-logs/tasks/create-docs.yml View File

@@ -8,8 +8,8 @@
8 8
   shell: >
9 9
     gunzip "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh.gz";
10 10
   with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
11
-  ignore_errors: yes
12
-  when:  artcl_gzip_only|bool
11
+  ignore_errors: true
12
+  when: artcl_gzip_only|bool
13 13
 
14 14
 - name: Generate rST docs from scripts and move to Sphinx src dir
15 15
   shell: >
@@ -17,19 +17,19 @@
17 17
        "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh" > \
18 18
        "{{ artcl_docs_source_dir }}/{{ item }}.rst"
19 19
   with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
20
-  ignore_errors: yes
20
+  ignore_errors: true
21 21
 
22 22
 - name: Fetch static rST docs to include in output docs
23 23
   shell: >
24 24
     cp "{{ artcl_docs_source_dir }}/../static/{{ item }}.rst" "{{ artcl_docs_source_dir }}"
25 25
   with_items: "{{ artcl_create_docs_payload.included_static_docs }}"
26
-  ignore_errors: yes
26
+  ignore_errors: true
27 27
 
28 28
 - name: Generate fresh index.rst for Sphinx
29 29
   template:
30 30
     src: index.rst.j2
31 31
     dest: "{{ artcl_docs_source_dir }}/index.rst"
32
-    force: yes
32
+    force: true
33 33
 
34 34
 - name: Ensure docs dir exists
35 35
   file:
@@ -41,4 +41,4 @@
41 41
     set -o pipefail &&
42 42
     sphinx-build -b html "{{ artcl_docs_source_dir }}" "{{ artcl_docs_build_dir }}"
43 43
     2>&1 {{ timestamper_cmd }} > {{ artcl_collect_dir }}/docs/sphinx_build.log
44
-  ignore_errors: yes
44
+  ignore_errors: true

+ 7
- 7
roles/collect-logs/tasks/publish.yml View File

@@ -21,35 +21,35 @@
21 21
     {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.json;
22 22
     cp -r {{ local_working_dir }}/ara_oooq {{ artcl_collect_dir }}/;
23 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 26
 - name: Generate and retrieve root the ARA static playbook report
27
-  become: yes
27
+  become: true
28 28
   shell: >
29 29
     {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_root;
30 30
     {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.root.json;
31 31
     cp -r {{ local_working_dir }}/ara_oooq_root {{ artcl_collect_dir }}/;
32 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 35
 - name: Generate and retrieve the ARA static playbook report for OC deploy
36
-  become: yes
36
+  become: true
37 37
   shell: >
38 38
     {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_oc;
39 39
     {{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.oc.json;
40 40
     cp -r {{ local_working_dir }}/ara_oooq_oc {{ artcl_collect_dir }}/;
41 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 43
   environment:
44 44
     ARA_DATABASE: 'sqlite:///{{ ara_overcloud_db_path }}'
45 45
 
46 46
 - include: ara_graphite.yml
47 47
   when: ara_graphite_server is defined
48
-  ignore_errors: yes
48
+  ignore_errors: true
49 49
 
50 50
 - include: ara_influxdb.yml
51 51
   when: influxdb_url is defined or influxdb_create_data_file|bool
52
-  ignore_errors: yes
52
+  ignore_errors: true
53 53
 
54 54
 - name: fetch stackviz results to the root of the collect_dir
55 55
   shell: >

+ 1
- 1
roles/freeipa-setup/README.md View File

@@ -30,7 +30,7 @@ Sample playbook to call the role
30 30
 # Deploy the FreeIPA Server
31 31
 - name:  Deploy FreeIPA
32 32
   hosts: freeipa_host
33
-  gather_facts: no
33
+  gather_facts: false
34 34
   roles:
35 35
     - freeipa-setup
36 36
 ```

+ 2
- 2
roles/install-built-repo/README.md View File

@@ -36,13 +36,13 @@ Including an example of how to use this role
36 36
     ---
37 37
     - name:  Run repo install
38 38
       hosts: undercloud
39
-      gather_facts: no
39
+      gather_facts: false
40 40
       roles:
41 41
         - install-built-repo
42 42
 
43 43
     - name:  Run repo install
44 44
       hosts: undercloud
45
-      gather_facts: no
45
+      gather_facts: false
46 46
       vars:
47 47
         ib_repo_image_inject: true
48 48
         ib_repo_image_path: "{{ working_dir }}/overcloud-full.qcow2"

+ 1
- 1
roles/multinodes/README.md View File

@@ -52,7 +52,7 @@ Example Playbook
52 52
     ---
53 53
     - name: Multinode
54 54
       hosts: localhost
55
-      gather_facts: no
55
+      gather_facts: false
56 56
       roles:
57 57
         - role: multinodes
58 58
 

+ 1
- 1
roles/overcloud-prep-flavors/README.md View File

@@ -30,7 +30,7 @@ Example Playbook
30 30
 
31 31
     - name: Copy configuration files
32 32
       hosts: virthost
33
-      gather_facts: no
33
+      gather_facts: false
34 34
       roles:
35 35
         - ansible-role-tripleo-overcloud-prep-config
36 36
 

+ 1
- 1
roles/overcloud-prep-images/README.md View File

@@ -47,7 +47,7 @@ Example Playbook
47 47
 
48 48
     - name: Copy configuration files
49 49
       hosts: virthost
50
-      gather_facts: no
50
+      gather_facts: false
51 51
       roles:
52 52
         - ansible-role-tripleo-overcloud-prep-config
53 53
 

+ 1
- 1
roles/overcloud-prep-network/README.md View File

@@ -76,7 +76,7 @@ Example Playbook
76 76
 
77 77
     - name: Copy configuration files
78 78
       hosts: virthost
79
-      gather_facts: no
79
+      gather_facts: false
80 80
       roles:
81 81
         - ansible-role-tripleo-overcloud-prep-config
82 82
 

+ 2
- 2
roles/snapshot-libvirt/README.md View File

@@ -39,7 +39,7 @@ Example Usage
39 39
 ---
40 40
 - name:  Create a snapshot (or update a snapshot)
41 41
   hosts: virthost
42
-  gather_facts: yes
42
+  gather_facts: true
43 43
   vars:
44 44
     - snapshot_create: true
45 45
     - libvirt_volume_path: /opt/vm_images
@@ -53,7 +53,7 @@ Example Usage
53 53
 
54 54
 - name:  Restore a snapshot
55 55
   hosts: virthost
56
-  gather_facts: yes
56
+  gather_facts: true
57 57
   vars:
58 58
     - snapshot_restore: true
59 59
     - libvirt_volume_path: /opt/vm_images

+ 2
- 2
roles/undercloud-deploy/README.md View File

@@ -196,7 +196,7 @@ Sample playbook to call the role
196 196
 # Deploy the undercloud
197 197
 - name:  Install undercloud
198 198
   hosts: undercloud
199
-  gather_facts: no
199
+  gather_facts: false
200 200
   roles:
201 201
     - undercloud-deploy
202 202
 ```
@@ -319,7 +319,7 @@ And an example playbook to call the role is:
319 319
 # Deploy the undercloud
320 320
 - name:  Deploy undercloud (experimental)
321 321
   hosts: undercloud
322
-  gather_facts: no
322
+  gather_facts: false
323 323
   vars:
324 324
     containerized_undercloud: true
325 325
     undercloud_install_script: undercloud-deploy.sh.j2

+ 1
- 1
roles/undercloud-setup/README.md View File

@@ -58,7 +58,7 @@ Example Playbook
58 58
 
59 59
     - name: Set up CentOS undercloud node to run TripleO Quickstart
60 60
       hosts: undercloud
61
-      gather_facts: no
61
+      gather_facts: false
62 62
       roles:
63 63
         - undercloud-setup
64 64
 

+ 1
- 1
roles/undercloud-setup/tasks/ovb_setup_connectivity.yml View File

@@ -11,7 +11,7 @@
11 11
     mode: 0755
12 12
 
13 13
 - name: Setup interfaces, connectivity on the undercloud
14
-  become: yes
14
+  become: true
15 15
   shell: >
16 16
     set -o pipefail &&
17 17
     {{ working_dir }}/ovb-undercloud-connectivity.sh 2>&1 {{ timestamper_cmd }} >

+ 1
- 1
roles/validate-tempest/README.md View File

@@ -145,7 +145,7 @@ Example Playbook
145 145
     ---
146 146
     - name:  Run tempest
147 147
       hosts: undercloud
148
-      gather_facts: no
148
+      gather_facts: false
149 149
       roles:
150 150
         - validate-tempest
151 151
 

+ 1
- 1
roles/validate-tempest/tasks/main.yml View File

@@ -53,7 +53,7 @@
53 53
   when: run_tempest|bool
54 54
   tags:
55 55
     - run-stackviz
56
-  ignore_errors: yes
56
+  ignore_errors: true
57 57
 
58 58
 - include: post-tempest.yml
59 59
   when: post_tempest|bool and run_tempest|bool

+ 15
- 12
roles/validate-tempest/tasks/pre-tempest.yml View File

@@ -1,16 +1,16 @@
1 1
 ---
2 2
 - name: Set the number of workers in tempest
3 3
   set_fact:
4
-      tempest_workers: "{{ ansible_processor_vcpus|int // 2 }}"
4
+    tempest_workers: "{{ ansible_processor_vcpus|int // 2 }}"
5 5
   when: tempest_workers is not defined
6 6
 
7 7
 - name: Set rc file to be sourced to run tempest
8 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 11
 - name: Set rc file to be sourced to run tempest with in container
12 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 14
   when: tempest_format == 'container'
15 15
 
16 16
 - name: Create overcloud tempest setup script
@@ -44,17 +44,20 @@
44 44
   when: tempest_whitelist|length > 0
45 45
 
46 46
 - name: Install packages to generate subunit results
47
-  become: yes
48
-  package: name={{ item }} state=present
49
-  with_items:
50
-    - python-subunit
51
-    - subunit-filters
52
-    - python-os-testr
47
+  become: true
48
+  package:
49
+    name:
50
+      - python-subunit
51
+      - subunit-filters
52
+      - python-os-testr
53
+    state: present
53 54
   when: tempest_format in ['container', 'packages']
54 55
 
55 56
 - name: Install stestr
56
-  become: yes
57
-  package: name=python-stestr state=present
57
+  become: true
58
+  package:
59
+    name: python-stestr
60
+    state: present
58 61
   when: tempest_format in ['container', 'packages'] and release not in ['newton', 'ocata']
59 62
 
60 63
 - ignore_errors: true
@@ -87,5 +90,5 @@
87 90
         --to-file "{{ working_dir }}/{{ skip_file }}" --format txt
88 91
       args:
89 92
         chdir: "{{ working_dir }}/bugcheck"
90
-      ignore_errors: yes
93
+      ignore_errors: true
91 94
   when: check_tempest_bugs|bool

+ 3
- 4
roles/validate-tempest/tasks/tempest-results.yml View File

@@ -41,13 +41,13 @@
41 41
       fetch:
42 42
         src: "{{ working_dir }}/tempest/tempest.html"
43 43
         dest: "{{ local_working_dir }}/tempest.html"
44
-        flat: yes
44
+        flat: true
45 45
 
46 46
     - name: Fetch nosetests results
47 47
       fetch:
48 48
         src: "{{ working_dir }}/tempest/tempest.xml"
49 49
         dest: "{{ local_working_dir }}/nosetests.xml"
50
-        flat: yes
50
+        flat: true
51 51
 
52 52
     - name: Copying tempestmail files
53 53
       synchronize:
@@ -71,5 +71,4 @@
71 71
           --skip-file "{{ working_dir }}/tempestmail/tempest_skip_{{ release }}.yml"
72 72
       args:
73 73
         chdir: "{{ working_dir }}/tempestmail"
74
-      ignore_errors: yes
75
-
74
+      ignore_errors: true

+ 3
- 3
roles/validate-tempest/tasks/tempest-rpm.yml View File

@@ -19,7 +19,7 @@
19 19
 - name: Install openstack services tempest plugins
20 20
   yum: state=latest name={{ item }}
21 21
   with_items: "{{ tempest_plugins }}"
22
-  become: yes
22
+  become: true
23 23
   when: tempest_plugins|length > 0
24 24
 
25 25
 - name: Install openstack tempest
@@ -38,8 +38,8 @@
38 38
 
39 39
 - name: Set tempest init command
40 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 43
 - name: Set tempestconf call
44 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 %}"

+ 1
- 1
roles/validate-ui/defaults/main.yml View File

@@ -2,4 +2,4 @@
2 2
 validate_ui_simple: false
3 3
 ui_validate_simple_script: validate_ui_simple.sh.j2
4 4
 ui_validate_simple_log: validate_ui_simple.log
5
-virthost_addr: "{{ hostvars[groups['virthost'][0]].ansible_host }}"
5
+virthost_addr: "{{ hostvars[groups['virthost'][0]].ansible_host }}"

+ 1
- 0
roles/validate-ui/meta/main.yml View File

@@ -1,2 +1,3 @@
1
+---
1 2
 dependencies:
2 3
   - extras-common

+ 1
- 0
roles/virthost-full-cleanup/meta/main.yml View File

@@ -1,2 +1,3 @@
1
+---
1 2
 dependencies:
2 3
   - extras-common

+ 33
- 32
roles/virthost-full-cleanup/tasks/main.yml View File

@@ -25,7 +25,7 @@
25 25
       with_items: "{{ vms.list_vms }}"
26 26
 
27 27
     - name: destroy any remaining vms
28
-      virt : command=destroy name={{ item }}
28
+      virt: command=destroy name={{ item }}
29 29
       with_items: "{{ vms.list_vms }}"
30 30
 
31 31
     - name: remove images from /var/lib/libvirt/images
@@ -51,11 +51,11 @@
51 51
       command: virsh net-destroy default
52 52
 
53 53
     - name: destroy default pool
54
-      become: yes
54
+      become: true
55 55
       command: virsh pool-destroy default
56 56
 
57 57
     - name: destroy local libvirt storage, networks and config
58
-      become: yes
58
+      become: true
59 59
       shell: "rm -rf {{ working_dir }}/.config/libvirt"
60 60
 
61 61
     - name: get user_id for stack user
@@ -118,7 +118,7 @@
118 118
 
119 119
     - name: kill all the network managers processes
120 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 123
     - name: ensure the network service is enabled
124 124
       service: name=network enabled=yes
@@ -130,32 +130,33 @@
130 130
         - /usr/bin/instack-setup-host
131 131
 
132 132
     - name: remove any instack rpms from the host
133
-      yum: name={{item}} state=absent
134
-      ignore_errors: yes
135
-      with_items:
136
-        - instack-*
137
-        - rdo-release
138
-        - rhos-release
139
-        - libvirt
140
-        - libvirt-daemon
141
-        - openvswitch
142
-        - NetworkManager
143
-        - qemu-*
144
-        - openstack-*
145
-        - python-qpid-*
146
-        - pexpect
147
-        - python-pexpect
148
-        - python-tuskarclient*
149
-        - python-keystone*
150
-        - python-openstackclient
151
-        - python-oslo*
152
-        - python-qpid
153
-        - python-ironic*
154
-        - python-eventlet
155
-        - tripleo-*
156
-        - python-rdomanager-*
157
-        - jq
158
-        - python-tripleo*
133
+      yum:
134
+        name:
135
+          - instack-*
136
+          - rdo-release
137
+          - rhos-release
138
+          - libvirt
139
+          - libvirt-daemon
140
+          - openvswitch
141
+          - NetworkManager
142
+          - qemu-*
143
+          - openstack-*
144
+          - python-qpid-*
145
+          - pexpect
146
+          - python-pexpect
147
+          - python-tuskarclient*
148
+          - python-keystone*
149
+          - python-openstackclient
150
+          - python-oslo*
151
+          - python-qpid
152
+          - python-ironic*
153
+          - python-eventlet
154
+          - tripleo-*
155
+          - python-rdomanager-*
156
+          - jq
157
+          - python-tripleo*
158
+        state: absent
159
+      ignore_errors: true
159 160
 
160 161
     - name: find any remaining rpms from director repos
161 162
       shell: "yumdb search from_repo rhelosp-*-director* | egrep -v from_repo | grep -v '^$' | tail -n +2 "
@@ -170,7 +171,7 @@
170 171
       register: delorean_rpms
171 172
 
172 173
     # BUG: when this task encounters an rpm of the form "1:somerpm" it fails
173
-    #- name: debug
174
+    # - name: debug
174 175
     #  debug: var={{ item }}
175 176
     #  with_flattened:
176 177
     #    - director_rpms.stdout_lines
@@ -179,7 +180,7 @@
179 180
 
180 181
     - name: remove any openstack rpms from the host
181 182
       yum: name={{item}} state=absent
182
-      ignore_errors: yes
183
+      ignore_errors: true
183 184
       with_flattened:
184 185
         - "{{ director_rpms.stdout_lines }}"
185 186
         - "{{ rhos_rpms.stdout_lines }}"

+ 1
- 0
zuul.d/layout.yaml View File

@@ -1,3 +1,4 @@
1
+---
1 2
 - project:
2 3
     templates:
3 4
       - tripleo-undercloud-jobs

Loading…
Cancel
Save