openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Adapt code to newer code style (linters)

Browse Source 
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
This commit is contained in:
Sorin Sbarnea
2018-11-16 12:42:51 +00:00
parent 712b4da542
commit cc82349363
62 changed files with 357 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
playbooks/baremetal-full-overcloud-prep.yml
View File

@@ -1,7 +1,7 @@
---
- name: Prepare the undercloud networks for the overcloud deployment
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-prep-network
tags:
@@ -9,7 +9,7 @@
- name: copy over config files
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-prep-config
tags:
@@ -17,7 +17,7 @@
- name: Perpare the baremetal overcloud
hosts: undercloud
gather_facts: yes
gather_facts: true
roles:
- baremetal-prep-overcloud
tags:
@@ -25,7 +25,7 @@
- name: Prepare overcloud containers
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- {role: overcloud-prep-containers, when: containerized_overcloud|bool}
tags:
@@ -33,7 +33,7 @@
- name: Run tripleo-validations pre-introspection tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
@@ -44,7 +44,7 @@
- name: Prepare the overcloud images for deployment
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-prep-images
tags:
@@ -52,7 +52,7 @@
- name: Prepare overcloud flavors
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- {role: overcloud-prep-flavors,
when: step_overcloud_prep_flavors|default(true)|bool}
@@ -61,7 +61,7 @@
- name: Prepare the SSL Configuration for the overcloud deployment
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- {role: overcloud-ssl}
tags:
@@ -69,7 +69,7 @@
- name: Run tripleo-validations pre-deployment tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:

9
playbooks/baremetal-full-overcloud-validate.yml
View File

@@ -13,7 +13,7 @@
hosts: undercloud
tags:
- overcloud-validate
gather_facts: no
gather_facts: false
roles:
- {role: validate-sanity-checks,
when: run_sanity_checks|default(false)|bool}
@@ -23,7 +23,7 @@
hosts: undercloud
tags:
- overcloud-validate
gather_facts: no
gather_facts: false
roles:
- {role: validate-simple, when: test_ping|bool}
@@ -32,7 +32,7 @@
hosts: undercloud
tags:
- overcloud-validate
gather_facts: no
gather_facts: false
roles:
- {role: validate-tempest, when: run_tempest|bool}
@@ -40,8 +40,7 @@
hosts: undercloud
tags:
- overcloud-delete
gather_facts: no
gather_facts: false
roles:
- {role: overcloud-delete,
when: step_delete_overcloud|default(false)|bool}

7
playbooks/baremetal-full-overcloud.yml
View File

@@ -1,7 +1,7 @@
---
- name: Deploy the overcloud
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-deploy
tags:
@@ -10,7 +10,7 @@
# Add the overcloud nodes to the generated inventory.
- name: Inventory the overcloud
hosts: undercloud
gather_facts: yes
gather_facts: true
tags:
- overcloud-deploy
vars:
@@ -33,7 +33,7 @@
- name: Run tripleo-validations post-deployment tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
@@ -41,4 +41,3 @@
roles:
- {role: tripleo-validations,
when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

8
playbooks/baremetal-full-undercloud.yml
View File

@@ -1,7 +1,7 @@
---
- name: Deploy the undercloud
hosts: undercloud
gather_facts: yes
gather_facts: true
roles:
- undercloud-deploy
tags:
@@ -9,11 +9,11 @@
- name: Configure tripleo-validations
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
run_tripleo_validations_setup: True
run_tripleo_validations_setup: true
roles:
- {role: tripleo-validations,
when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
@@ -28,7 +28,7 @@
- name: Build images for quickstart
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- {role: build-images, when: to_build|default(false)|bool}
tags:

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

@@ -36,7 +36,7 @@
- name: Setup undercloud and baremetal vms and networks in libvirt
hosts: virthost
gather_facts: yes
gather_facts: true
roles:
- libvirt/setup
@@ -44,7 +44,7 @@
# inventory.
- name: Inventory the undercloud
hosts: localhost
gather_facts: yes
gather_facts: true
vars:
inventory: undercloud
roles:
@@ -52,7 +52,6 @@
- name: Prepare the host for PXE forwarding
hosts: virthost
gather_facts: no
gather_facts: false
roles:
- baremetal-prep-virthost

8
playbooks/baremetal-undercloud.yml
View File

@@ -8,7 +8,7 @@
- name: Add the undercloud node to the generated inventory
hosts: localhost
gather_facts: yes
gather_facts: true
roles:
- tripleo-inventory
tags:
@@ -16,7 +16,7 @@
- name: Setup repositories
hosts: undercloud
gather_facts: yes
gather_facts: true
roles:
- repo-setup
tags:
@@ -24,7 +24,7 @@
- name: Install packages
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- baremetal-undercloud/packages
tags:
@@ -32,7 +32,7 @@
- name: Fetch the overcloud images
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- fetch-images
tags:

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

@@ -15,7 +15,7 @@
- name: Inventory the virthost
hosts: localhost
gather_facts: yes
gather_facts: true
roles:
- tripleo-inventory
tags:

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

@@ -15,7 +15,7 @@
- name: Inventory the virthost
hosts: localhost
gather_facts: yes
gather_facts: true
roles:
- tripleo-inventory
tags:

2
playbooks/cleanup-destructive.yml
View File

@@ -12,6 +12,6 @@
- name: Clean up tripleo packages and libvirt
hosts: virthost
gather_facts: no
gather_facts: false
roles:
- virthost-full-cleanup

4
playbooks/collect-logs.yml
View File

@@ -6,14 +6,14 @@
- name: Ensure the overcloud nodes are added to the generated inventory
hosts: undercloud
gather_facts: yes
gather_facts: true
tags:
- collect-logs
vars:
inventory: all
roles:
- tripleo-inventory
ignore_errors: yes
ignore_errors: true
- name: Collect logs
hosts: all:!localhost:!127.0.0.2

5
playbooks/deploy-delete.yml
View File

@@ -1,15 +1,16 @@
---
# This is the playbook used by the `quickstart.sh` script.
- include: quickstart-extras.yml
- name: Collect logs, create docs, publish
hosts: all:!localhost
gather_facts: no
gather_facts: false
roles:
- {role: tripleo-collect-logs, artcl_collect: true}
- name: test overcloud deletion
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- {role: overcloud-delete}

15
playbooks/multinode-overcloud-prep.yml
View File

@@ -1,7 +1,7 @@
---
- name: Run overcloud prep config
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- role: overcloud-prep-config
# only run when we know we have to, save time otherwise
@@ -11,13 +11,16 @@
- name: Run overcloud prep roles
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- { role: overcloud-prep-images, step_overcloud_image: false, step_glance_upload: true, step_register: false }
- {role: overcloud-prep-images,
step_overcloud_image: false,
step_glance_upload: true,
step_register: false}
- name: Run tripleo-validations pre-introspection tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
@@ -28,7 +31,7 @@
- name: Prepare for containerized deployment
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- overcloud-prep-containers
roles:
@@ -38,7 +41,7 @@
- name: Run tripleo-validations pre-deployment tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:

3
playbooks/multinode-overcloud-update.yml
View File

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

7
playbooks/multinode-overcloud-upgrade.yml
View File

@@ -1,8 +1,9 @@
---
- name: Generate repo-setup script for overcloud upgrade
hosts: undercloud
tags:
- overcloud-upgrade
gather_facts: no
gather_facts: false
vars:
repo_run_live: false
repo_setup_script: "repo-setup-{{ target_upgrade_version }}.sh"
@@ -18,7 +19,7 @@
- name: Prepare containers for Upgrade
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- overcloud-prep-containers
roles:
@@ -35,7 +36,7 @@
- name: Run tripleo-upgrade role to upgrade overcloud
hosts: undercloud
gather_facts: yes
gather_facts: true
tags:
- overcloud-upgrade
vars:

5
playbooks/multinode-overcloud.yml
View File

@@ -1,7 +1,7 @@
---
- name: Deploy the overcloud
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-deploy
environment:
@@ -22,7 +22,7 @@
- name: Run tripleo-validations post-deployment tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
@@ -30,4 +30,3 @@
roles:
- {role: tripleo-validations,
when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

2
playbooks/multinode-standalone-upgrade.yml
View File

@@ -56,7 +56,7 @@
- name: Validate the Standalone upgrade
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- {role: validate-tempest, when: run_tempest|bool}
tags:

4
playbooks/multinode-standalone.yml
View File

@@ -1,7 +1,7 @@
---
- name: Add the overcloud nodes to the generated inventory
hosts: undercloud
gather_facts: yes
gather_facts: true
tags:
- standalone
vars:
@@ -44,7 +44,7 @@
- name: Validate the undercloud
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- {role: validate-tempest, when: run_tempest|bool}
tags:

6
playbooks/multinode-undercloud.yml
View File

@@ -1,7 +1,7 @@
---
- name: Add the overcloud nodes to the generated inventory
hosts: undercloud
gather_facts: yes
gather_facts: true
tags:
- overcloud-deploy
vars:
@@ -71,11 +71,11 @@
- name: Configure tripleo-validations
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
run_tripleo_validations_setup: True
run_tripleo_validations_setup: true
roles:
- {role: tripleo-validations,
when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

2
playbooks/multinode-validate.yml
View File

@@ -14,7 +14,7 @@
tags:
- overcloud-validate
- undercloud-validate
gather_facts: no
gather_facts: false
roles:
- {role: validate-simple, when: test_ping|bool}
- {role: validate-tempest, when: run_tempest|bool}

4
playbooks/nodepool-setup.yml
View File

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

36
playbooks/ovb-setup.yml
View File

@@ -7,26 +7,26 @@
- name: Inventory the undercloud instance
hosts: localhost
gather_facts: yes
gather_facts: true
roles:
- tripleo-inventory
- name: Setup the undercloud
hosts: undercloud
gather_facts: yes
gather_facts: true
roles:
- undercloud-setup
tasks:
- name: Add eth2 interface from eth2.conf
command: os-net-config -c {{ working_dir }}/eth2.conf -v
become: yes
become: true
when:
- network_isolation|bool
- use_testenv_broker|default(false)|bool
- name: Inventory the undercloud instance
hosts: localhost
gather_facts: yes
gather_facts: true
roles:
- tripleo-inventory
@@ -49,7 +49,7 @@
- name: Get images for quickstart
hosts: undercloud
gather_facts: no
gather_facts: false
vars:
ib_repo_image_inject: "{{ not to_build|bool }}"
ib_repo_run_live: false
@@ -57,9 +57,23 @@
modify_image_vc_cpu: 4
modify_image_vc_verbose: true
roles:
- { role: fetch-images, when: not to_build|bool }
- { role: repo-setup, repo_inject_image_path: "$HOME/overcloud-full.qcow2", repo_run_live: false, when: not to_build|bool }
- { 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 }
- { role: install-built-repo, ib_repo_image_path: "$HOME/overcloud-full.qcow2", when: compressed_gating_repo is defined and not to_build|bool }
- { 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 }
- {role: fetch-images,
when: not to_build|bool}
- {role: repo-setup,
repo_inject_image_path: "$HOME/overcloud-full.qcow2",
repo_run_live: false,
when: not to_build|bool}
- {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}
- {role: install-built-repo,
ib_repo_image_path: "$HOME/overcloud-full.qcow2",
when: compressed_gating_repo is defined and not to_build|bool}
- {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}

2
playbooks/provision_multinodes.yml
View File

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

17
playbooks/quickstart-extras-overcloud-prep.yml
View File

@@ -1,7 +1,8 @@
---
# Prepare any additional configuration files required by the overcloud
- name: Prepare configuration files for the overcloud deployment
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- overcloud-prep-config
roles:
@@ -10,7 +11,7 @@
# Prepare the overcloud for a containerized deployment
- name: Prepare overcloud containers
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- overcloud-prep-containers
roles:
@@ -19,7 +20,7 @@
# Prepare the overcloud images for deployment
- name: Prepare the overcloud images for deployment
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- overcloud-prep-images
roles:
@@ -27,7 +28,7 @@
- name: Run tripleo-validations pre-introspection tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
@@ -39,7 +40,7 @@
# Prepare the overcloud flavor configuration
- name: Prepare overcloud flavors
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- overcloud-prep-flavors
roles:
@@ -48,7 +49,7 @@
# Prepare the undercloud networks for the overcloud deployment
- name: Prepare the undercloud networks for the overcloud deployment
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- overcloud-prep-network
roles:
@@ -56,7 +57,7 @@
- name: Run tripleo-validations pre-deployment tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
@@ -67,7 +68,7 @@
- name: Prepare the SSL Configuration for the overcloud deployment
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- overcloud-scripts
- overcloud-ssl

7
playbooks/quickstart-extras-overcloud.yml
View File

@@ -1,7 +1,8 @@
---
# Deploy the overcloud
- name: Deploy the overcloud
hosts: undercloud
gather_facts: yes
gather_facts: true
tags:
- overcloud-deploy
roles:
@@ -9,7 +10,7 @@
- name: Add the overcloud nodes to the generated inventory
hosts: undercloud
gather_facts: yes
gather_facts: true
tags:
- overcloud-deploy
- overcloud-inventory
@@ -20,7 +21,7 @@
- name: Run tripleo-validations post-deployment tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:

12
playbooks/quickstart-extras-undercloud.yml
View File

@@ -1,7 +1,8 @@
---
# Deploy the FreeIPA server
- name: Deploy the FreeIPA server
hosts: supplemental
gather_facts: no
gather_facts: false
tags:
- freeipa-setup
roles:
@@ -10,7 +11,7 @@
# setup for the undercloud
- name: Setup the undercloud
hosts: undercloud
gather_facts: no
gather_facts: false
vars:
ansible_user: root
tags:
@@ -21,7 +22,7 @@
# Deploy the undercloud
- name: Deploy the undercloud
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- undercloud-deploy
roles:
@@ -29,12 +30,11 @@
- name: Configure tripleo-validations
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
run_tripleo_validations_setup: True
run_tripleo_validations_setup: true
roles:
- {role: tripleo-validations,
when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

7
playbooks/quickstart-extras-validate.yml
View File

@@ -1,3 +1,4 @@
---
# Validate the deployment
- name: setup dstat performance monitoring
hosts: overcloud
@@ -12,7 +13,7 @@
hosts: undercloud
tags:
- overcloud-validate
gather_facts: no
gather_facts: false
roles:
- {role: validate-simple, when: test_ping|bool}
@@ -21,7 +22,7 @@
hosts: undercloud
tags:
- overcloud-validate
gather_facts: no
gather_facts: false
roles:
- {role: validate-tempest, when: tempest_config|bool or run_tempest|bool}
@@ -30,6 +31,6 @@
hosts: localhost
tags:
- tripleoui-validate
gather_facts: yes
gather_facts: true
roles:
- {role: validate-ui, when: validate_ui_simple|bool and undercloud_enable_ui|default(true)|bool}

2
playbooks/repo-setup.yml
View File

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

4
playbooks/scale_nodes_verify.yml
View File

@@ -7,7 +7,7 @@
# Re-inventory the overcloud
- name: Inventory the overcloud
hosts: undercloud
gather_facts: yes
gather_facts: true
vars:
inventory: all
roles:
@@ -16,6 +16,6 @@
# Validate the overcloud
- name: Validate the overcloud post-delete-node
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- validate-simple

3
playbooks/snapshot-libvirt.yml
View File

@@ -1,7 +1,7 @@
---
- name: Snapshot virts
hosts: virthost
gather_facts: yes
gather_facts: true
vars:
- libvirt_uri: qemu:///system
- overcloud_nodes:
@@ -10,4 +10,3 @@
roles:
- snapshot-libvirt
become: true

2
playbooks/tempest.yml
View File

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

7
playbooks/tripleo-validations.yml
View File

@@ -2,18 +2,18 @@
- name: Configure tripleo-validations
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
run_tripleo_validations_setup: True
run_tripleo_validations_setup: true
roles:
- {role: tripleo-validations,
when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
- name: Run tripleo-validations pre-introspection tests
hosts: undercloud
gather_facts: no
gather_facts: false
tags:
- tripleo-validations
vars:
@@ -21,4 +21,3 @@
roles:
- {role: tripleo-validations,
when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}

2
roles/baremetal-prep-overcloud/README.md
View File

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

4
roles/baremetal-prep-overcloud/tasks/adjust-mtu-dnsmasq-ironic.yml
View File

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

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

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

2
roles/baremetal-prep-virthost/README.md
View File

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

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

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

16
roles/baremetal-undercloud/README.md
View File

@@ -219,7 +219,7 @@ others coming from various related to tripleo-quickstart:
# Machine at this point is provided
- name: Add the undercloud node to the generated inventory
hosts: localhost
gather_facts: yes
gather_facts: true
roles:
- tripleo-inventory
tags:
@@ -228,7 +228,7 @@ others coming from various related to tripleo-quickstart:
# Deploy the undercloud
- name: Install undercloud
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- tripleo/undercloud
tags:
@@ -245,7 +245,7 @@ others coming from various related to tripleo-quickstart:
# Prepare any additional configuration files required by the overcloud
- name: Prepare configuration files for the overcloud deployment
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-prep-config
tags:
@@ -254,7 +254,7 @@ others coming from various related to tripleo-quickstart:
# Prepare the overcloud images for deployment
- name: Prepare the overcloud images for deployment
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-prep-images
tags:
@@ -263,7 +263,7 @@ others coming from various related to tripleo-quickstart:
# Prepare the overcloud flavor configuration
- name: Prepare overcloud flavors
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-prep-flavors
tags:
@@ -272,7 +272,7 @@ others coming from various related to tripleo-quickstart:
# Prepare the undercloud networks for the overcloud deployment
- name: Prepare the undercloud networks for the overcloud deployment
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- overcloud-prep-network
tags:
@@ -281,7 +281,7 @@ others coming from various related to tripleo-quickstart:
# Deploy the overcloud
- name: Deploy the overcloud
hosts: undercloud
gather_facts: yes
gather_facts: true
roles:
- overcloud-deploy
tags:
@@ -289,7 +289,7 @@ others coming from various related to tripleo-quickstart:
- name: Add the overcloud nodes to the generated inventory
hosts: undercloud
gather_facts: yes
gather_facts: true
vars:
inventory: all
roles:

18
roles/build-test-packages/tasks/main.yml
View File

@@ -18,7 +18,7 @@
when: python_cmd is not defined
- name: Ensure DLRN package dependencies
become: yes
become: true
package:
state: present
name:
@@ -43,7 +43,7 @@
- name: Check if virtualenv is in the system
shell: "{{ python_cmd }} -m virtualenv --version"
args:
warn: no
warn: false
register: virtualenv_exist
changed_when: false
failed_when: false
@@ -60,17 +60,17 @@
{% endif %}
- name: Create mock group
become: yes
become: true
group:
name: mock
state: present
- name: Add user to mock group
become: yes
become: true
user:
name: '{{ ansible_user_id }}'
groups: mock
append: yes
append: true
- name: Ensure DLRN dir is present
file:
@@ -81,7 +81,7 @@
shell:
rm -rf '{{ build_repo_dir }}/DLRN/*'
args:
warn: no
warn: false
register: result
changed_when: result.stdout or result.stderr
@@ -138,8 +138,10 @@
gawk '{ print $0 }; /^# repos$/ { exit }' {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}.cfg
> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
cat /etc/yum.repos.d/quickstart-{{ ansible_distribution | lower }}-*.repo >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
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;
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;
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;
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;
echo '"""' >> {{ build_repo_dir }}/DLRN/scripts/{{ ansible_distribution | lower }}-local.cfg;
mkdir -p /tmp/fake-dlrn-repos/current;
touch /tmp/fake-dlrn-repos/delorean-deps.repo;

2
roles/collect-logs/tasks/ara_influxdb.yml
View File

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

10
roles/collect-logs/tasks/collect.yml
View File

@@ -306,7 +306,7 @@
dest: "/tmp/{{ inventory_hostname }}-rsync-filter"
- name: Gather the logs to /tmp
become: yes
become: true
shell: >
set -o pipefail &&
rsync --quiet --recursive --copy-links --prune-empty-dirs
@@ -333,16 +333,16 @@
fetch:
src: "/tmp/{{ inventory_hostname }}.tar.gz"
dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar.gz"
flat: yes
validate_checksum: no
flat: true
validate_checksum: false
when: artcl_tar_gz|bool
- name: Fetch log archive (tar)
fetch:
src: "/tmp/{{ inventory_hostname }}.tar"
dest: "{{ artcl_collect_dir }}/{{ inventory_hostname }}.tar"
flat: yes
validate_checksum: no
flat: true
validate_checksum: false
when: artcl_gzip_only|bool
- name: Delete temporary log directory after collection

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

@@ -8,7 +8,7 @@
shell: >
gunzip "{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh.gz";
with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
ignore_errors: yes
ignore_errors: true
when: artcl_gzip_only|bool
- name: Generate rST docs from scripts and move to Sphinx src dir
@@ -17,19 +17,19 @@
"{{ artcl_collect_dir }}/undercloud/home/{{ undercloud_user }}/{{ item }}.sh" > \
"{{ artcl_docs_source_dir }}/{{ item }}.rst"
with_items: "{{ artcl_create_docs_payload.included_deployment_scripts }}"
ignore_errors: yes
ignore_errors: true
- name: Fetch static rST docs to include in output docs
shell: >
cp "{{ artcl_docs_source_dir }}/../static/{{ item }}.rst" "{{ artcl_docs_source_dir }}"
with_items: "{{ artcl_create_docs_payload.included_static_docs }}"
ignore_errors: yes
ignore_errors: true
- name: Generate fresh index.rst for Sphinx
template:
src: index.rst.j2
dest: "{{ artcl_docs_source_dir }}/index.rst"
force: yes
force: true
- name: Ensure docs dir exists
file:
@@ -41,4 +41,4 @@
set -o pipefail &&
sphinx-build -b html "{{ artcl_docs_source_dir }}" "{{ artcl_docs_build_dir }}"
2>&1 {{ timestamper_cmd }} > {{ artcl_collect_dir }}/docs/sphinx_build.log
ignore_errors: yes
ignore_errors: true

14
roles/collect-logs/tasks/publish.yml
View File

@@ -21,35 +21,35 @@
{{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.json;
cp -r {{ local_working_dir }}/ara_oooq {{ artcl_collect_dir }}/;
{% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq;{% endif %}
ignore_errors: yes
ignore_errors: true
- name: Generate and retrieve root the ARA static playbook report
become: yes
become: true
shell: >
{{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_root;
{{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.root.json;
cp -r {{ local_working_dir }}/ara_oooq_root {{ artcl_collect_dir }}/;
{% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_root;{% endif %}
ignore_errors: yes
ignore_errors: true
- name: Generate and retrieve the ARA static playbook report for OC deploy
become: yes
become: true
shell: >
{{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq_oc;
{{ local_working_dir }}/bin/ara task list --all -f json > {{ artcl_collect_dir }}/ara.oooq.oc.json;
cp -r {{ local_working_dir }}/ara_oooq_oc {{ artcl_collect_dir }}/;
{% if artcl_gzip_only|bool %}gzip --best --recursive {{ artcl_collect_dir }}/ara_oooq_oc;{% endif %}
ignore_errors: yes
ignore_errors: true
environment:
ARA_DATABASE: 'sqlite:///{{ ara_overcloud_db_path }}'
- include: ara_graphite.yml
when: ara_graphite_server is defined
ignore_errors: yes
ignore_errors: true
- include: ara_influxdb.yml
when: influxdb_url is defined or influxdb_create_data_file|bool
ignore_errors: yes
ignore_errors: true
- name: fetch stackviz results to the root of the collect_dir
shell: >

2
roles/freeipa-setup/README.md
View File

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

4
roles/install-built-repo/README.md
View File

@@ -36,13 +36,13 @@ Including an example of how to use this role
---
- name: Run repo install
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- install-built-repo
- name: Run repo install
hosts: undercloud
gather_facts: no
gather_facts: false
vars:
ib_repo_image_inject: true
ib_repo_image_path: "{{ working_dir }}/overcloud-full.qcow2"

2
roles/multinodes/README.md
View File

@@ -52,7 +52,7 @@ Example Playbook
---
- name: Multinode
hosts: localhost
gather_facts: no
gather_facts: false
roles:
- role: multinodes

2
roles/overcloud-prep-flavors/README.md
View File

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

2
roles/overcloud-prep-images/README.md
View File

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

2
roles/overcloud-prep-network/README.md
View File

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

4
roles/snapshot-libvirt/README.md
View File

@@ -39,7 +39,7 @@ Example Usage
---
- name: Create a snapshot (or update a snapshot)
hosts: virthost
gather_facts: yes
gather_facts: true
vars:
- snapshot_create: true
- libvirt_volume_path: /opt/vm_images
@@ -53,7 +53,7 @@ Example Usage
- name: Restore a snapshot
hosts: virthost
gather_facts: yes
gather_facts: true
vars:
- snapshot_restore: true
- libvirt_volume_path: /opt/vm_images

4
roles/undercloud-deploy/README.md
View File

@@ -196,7 +196,7 @@ Sample playbook to call the role
# Deploy the undercloud
- name: Install undercloud
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- undercloud-deploy
```
@@ -319,7 +319,7 @@ And an example playbook to call the role is:
# Deploy the undercloud
- name: Deploy undercloud (experimental)
hosts: undercloud
gather_facts: no
gather_facts: false
vars:
containerized_undercloud: true
undercloud_install_script: undercloud-deploy.sh.j2

2
roles/undercloud-setup/README.md
View File

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

2
roles/undercloud-setup/tasks/ovb_setup_connectivity.yml
View File

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

2
roles/validate-tempest/README.md
View File

@@ -145,7 +145,7 @@ Example Playbook
---
- name: Run tempest
hosts: undercloud
gather_facts: no
gather_facts: false
roles:
- validate-tempest

2
roles/validate-tempest/tasks/main.yml
View File

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

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

@@ -44,17 +44,20 @@
when: tempest_whitelist|length > 0
- name: Install packages to generate subunit results
become: yes
package: name={{ item }} state=present
with_items:
become: true
package:
name:
- python-subunit
- subunit-filters
- python-os-testr
state: present
when: tempest_format in ['container', 'packages']
- name: Install stestr
become: yes
package: name=python-stestr state=present
become: true
package:
name: python-stestr
state: present
when: tempest_format in ['container', 'packages'] and release not in ['newton', 'ocata']
- ignore_errors: true
@@ -87,5 +90,5 @@
--to-file "{{ working_dir }}/{{ skip_file }}" --format txt
args:
chdir: "{{ working_dir }}/bugcheck"
ignore_errors: yes
ignore_errors: true
when: check_tempest_bugs|bool

7
roles/validate-tempest/tasks/tempest-results.yml
View File

@@ -41,13 +41,13 @@
fetch:
src: "{{ working_dir }}/tempest/tempest.html"
dest: "{{ local_working_dir }}/tempest.html"
flat: yes
flat: true
- name: Fetch nosetests results
fetch:
src: "{{ working_dir }}/tempest/tempest.xml"
dest: "{{ local_working_dir }}/nosetests.xml"
flat: yes
flat: true
- name: Copying tempestmail files
synchronize:
@@ -71,5 +71,4 @@
--skip-file "{{ working_dir }}/tempestmail/tempest_skip_{{ release }}.yml"
args:
chdir: "{{ working_dir }}/tempestmail"
ignore_errors: yes
ignore_errors: true

2
roles/validate-tempest/tasks/tempest-rpm.yml
View File

@@ -19,7 +19,7 @@
- name: Install openstack services tempest plugins
yum: state=latest name={{ item }}
with_items: "{{ tempest_plugins }}"
become: yes
become: true
when: tempest_plugins|length > 0
- name: Install openstack tempest

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

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

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

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

15
roles/virthost-full-cleanup/tasks/main.yml
View File

@@ -51,11 +51,11 @@
command: virsh net-destroy default
- name: destroy default pool
become: yes
become: true
command: virsh pool-destroy default
- name: destroy local libvirt storage, networks and config
become: yes
become: true
shell: "rm -rf {{ working_dir }}/.config/libvirt"
- name: get user_id for stack user
@@ -118,7 +118,7 @@
- name: kill all the network managers processes
shell: kill -9 $(ps aux | grep NetworkManager | awk '{print $2}')
ignore_errors: yes # When no NM running, killall exits with 1
ignore_errors: true # When no NM running, killall exits with 1
- name: ensure the network service is enabled
service: name=network enabled=yes
@@ -130,9 +130,8 @@
- /usr/bin/instack-setup-host
- name: remove any instack rpms from the host
yum: name={{item}} state=absent
ignore_errors: yes
with_items:
yum:
name:
- instack-*
- rdo-release
- rhos-release
@@ -156,6 +155,8 @@
- python-rdomanager-*
- jq
- python-tripleo*
state: absent
ignore_errors: true
- name: find any remaining rpms from director repos
shell: "yumdb search from_repo rhelosp-*-director* | egrep -v from_repo | grep -v '^$' | tail -n +2 "
@@ -179,7 +180,7 @@
- name: remove any openstack rpms from the host
yum: name={{item}} state=absent
ignore_errors: yes
ignore_errors: true
with_flattened:
- "{{ director_rpms.stdout_lines }}"
- "{{ rhos_rpms.stdout_lines }}"

1
zuul.d/layout.yaml
View File

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