Merge "Adopt yamllint strict linting"

This commit is contained in:
Zuul
2018-12-04 22:28:05 +00:00
committed by Gerrit Code Review
152 changed files with 632 additions and 542 deletions

View File

@@ -15,14 +15,12 @@ repos:
- id: check-yaml
files: .*\.(yaml|yml)$
- repo: https://github.com/adrienverge/yamllint.git
rev: v1.12.1
rev: v1.13.0
hooks:
- id: yamllint
files: \.(yaml|yml)$
types: [file, yaml]
# uncommend once a new yamllint release is made:
# entry: yamllint --strict
entry: yamllint --strict
- repo: https://github.com/openstack-dev/bashate.git
rev: 0.6.0
hooks:

View File

@@ -1,3 +1,4 @@
---
environment_type: ovb_host_cloud
# undercloud.conf

View File

@@ -1,3 +1,4 @@
---
artcl_gzip_only: true
artcl_artifact_url: https://ci.centos.org/artifacts/rdo
artcl_publish: true

View File

@@ -1,3 +1,4 @@
---
# We run tempest in this topology instead of ping test.
# We set introspection to true and use only the minimal amount of nodes
# for this job, but test all defaults otherwise.
@@ -22,7 +23,7 @@ containerized_overcloud: true
# This enables TLS for the undercloud which will also make haproxy bind to the
# configured public-vip and admin-vip.
undercloud_generate_service_certificate: True
undercloud_generate_service_certificate: true
# This enables the deployment of the overcloud with SSL.
ssl_overcloud: false

View File

@@ -1,3 +1,4 @@
---
# EXPERIMENTAL FEATURE
# set the working_dir on the undercloud
working_dir: /home/stack

View File

@@ -42,12 +42,21 @@ flavor_args: >-
timeout_args: "--timeout {{ deploy_timeout }}"
extra_args: "--compute-scale 1 -e {{ overcloud_templates_path }}/environments/network-isolation.yaml -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml -e ~/network-environment.yaml --ntp-server pool.ntp.org"
extra_args: >
--compute-scale 1
-e {{ overcloud_templates_path }}/environments/network-isolation.yaml
-e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml
-e ~/network-environment.yaml --ntp-server pool.ntp.org
# Pull out scale_extra_args so the same var can be reused for the call to
# `openstack overcloud delete`
scale_extra_configs: "-e {{ overcloud_templates_path }}/environments/network-isolation.yaml -e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml -e /home/stack/network-environment.yaml"
scale_extra_args: "--{{ node_to_scale }}-scale {{ final_scale_value }} {{ scale_extra_configs }} --ntp-server pool.ntp.org"
scale_extra_configs: >
-e {{ overcloud_templates_path }}/environments/network-isolation.yaml
-e {{ overcloud_templates_path }}/environments/net-single-nic-with-vlans.yaml
-e /home/stack/network-environment.yaml
scale_extra_args: >
--{{ node_to_scale }}-scale {{ final_scale_value }} {{ scale_extra_configs }}
--ntp-server pool.ntp.org
# Scale deployment info
node_to_scale: compute # Type of node to scale

View File

@@ -1,3 +1,4 @@
---
# baremetal settings
step_introspect: true
network_isolation_type: public-bond

View File

@@ -1,3 +1,4 @@
---
# baremetal settings
step_introspect: true
network_isolation_type: multiple-nics

View File

@@ -1,3 +1,4 @@
---
artcl_publish: true
artcl_use_zuul_swift_upload: true
artcl_swift_container: artifacts

View File

@@ -14,4 +14,3 @@
hosts: localhost
roles:
- {role: ovb-manage-stack, ovb_manage_stack_mode: 'create'}

View File

@@ -1,3 +1,4 @@
---
# Playbook included in OVB setups that use a testenv broker to create the
# OVB stack.
@@ -40,9 +41,8 @@
addresses:
- ip_netmask: 10.0.0.1/24
- ip_netmask: 2001:db8:fd00:1000::1/64
create: yes
create: true
- name: Install ipmitool if not installed
yum: name=ipmitool state=latest
become: true

View File

@@ -1,3 +1,4 @@
---
# This is the playbook used by the `quickstart.sh` script.
- include: quickstart.yml

View File

@@ -3,4 +3,3 @@ features:
- Add support for composable upgrade since Newton release. The workflow for
composable upgrade implement also the one for making mixed upgrade
https://blueprints.launchpad.net/tripleo/+spec/tripleo-composable-upgrade-job

View File

@@ -1,4 +1,4 @@
---
features:
- |
Add `undercloud_roles_data` for containerized undercloud

View File

@@ -10,11 +10,9 @@ features:
config/general_config/containers_undercloud_minimal.yml
e.g. ./quickstart.sh -c $working_dir/config/general_config/containers_undercloud_minimal.yml --tags all -R master-tripleo-ci -w $working_dir $VIRTHOST
deprecations:
- |
The variable "undercloud_hieradata_override_file" which was the hieradata
override file for the undercloud, was deprecated in favor of the
variables "hieradata_override_file_classic_undercloud" and
"hieradata_override_file_t_h_t_undercloud".

View File

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

View File

@@ -10,5 +10,3 @@
shell: >
"{{ working_dir }}"/install-upstream-ipxe.sh
when: step_install_upstream_ipxe|bool

View File

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

View File

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

View File

@@ -1,3 +1,4 @@
---
# Additional packages
undercloud_additional_pkgs:
- vim

View File

@@ -1,3 +1,4 @@
---
# Ensure ntp packages are installed
- name: Install ntp packages
package:
@@ -8,13 +9,13 @@
- name: Enable ntpd service
service:
name: 'ntpd'
enabled: yes
enabled: true
# Enable ntpdate service
- name: Enable ntpdate service
service:
name: 'ntpdate'
enabled: yes
enabled: true
# Stop ntpd service
- name: Ensure ntp service is stopped to be able to launch ntpdate
@@ -42,7 +43,7 @@
lineinfile:
destfile: /etc/ntp/step-tickers
line: '{{ item }}'
create: yes
create: true
with_items: '{{ undercloud_custom_ntps|default([]) }}'
# Configure ntpdate hardware synchronization
@@ -54,7 +55,9 @@
# Sync time now
- name: Synchronize time immediately with ntpdate
shell: ntpdate $(grep ^server /etc/ntp.conf | tail -1 | awk '{print $2}')
shell: |
set -euxo pipefail
ntpdate $(grep ^server /etc/ntp.conf | tail -1 | awk '{print $2}')
changed_when: false
# Start ntpd

View File

@@ -1,3 +1,4 @@
---
- name: Provision script execution
shell: >
set -o pipefail &&

View File

@@ -1,3 +1,4 @@
---
- name: Check that virthost/undercloud is set
fail:
msg: "You need to set virthost/undercloud before running these playbooks."

View File

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

View File

@@ -1,3 +1,4 @@
---
- name: indirect role include (workaround to https://github.com/ansible/ansible/issues/19472)
include_role:
name: convert-image

View File

@@ -1,3 +1,4 @@
---
- name: indirect role include (workaround to https://github.com/ansible/ansible/issues/19472)
include_role:
name: fetch-images

View File

@@ -1,3 +1,4 @@
---
- name: indirect role include (workaround to https://github.com/ansible/ansible/issues/19472)
include_role:
name: modify-image

View File

@@ -5,7 +5,7 @@ build_repo_dir: "{{ ansible_user_dir }}"
artg_dlrn_repo_url: "https://github.com/openstack-packages/DLRN.git"
artg_rdoinfo_repo_url: "https://github.com/redhat-openstack/rdoinfo"
artg_compressed_gating_repo: "/home/stack/gating_repo.tar.gz"
artg_build_one: True
artg_build_one: true
dlrn_target: centos
dlrn_cleanup: false
dlrn_baseurl: "https://trunk.rdoproject.org/centos7/"

View File

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

View File

@@ -80,7 +80,7 @@
dest: '{{ build_repo_dir }}/DLRN/data/{{ project_name_mapped.stdout }}_distro'
refspec: '{{ artg_change.distgit.refspec }}'
version: 'FETCH_HEAD'
accept_hostkey: yes
accept_hostkey: true
when: artg_change.distgit is defined and (artg_repos_dir is not defined or copy_dir is failed)
- name: Run DLRN
@@ -106,4 +106,3 @@
chdir: '{{ build_repo_dir }}/DLRN'
register: repo_built
when: artg_build_one|bool

View File

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

View File

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

View File

@@ -1,3 +1,4 @@
---
# Conditional facts to be set which are common to undercloud and overcloud
- name: set docker_registry_namespace_used
set_fact:
@@ -58,4 +59,3 @@
var: container_build_id
tags:
- undercloud-install

View File

@@ -1,3 +1,4 @@
---
env_vars_to_source_file: env_vars_to_src.sh
reproducer_quickstart_script: reproducer-quickstart.sh.j2
reproducer_quickstart_readme_file: "{{ artcl_collect_dir }}/README-reproducer-quickstart.html"

View File

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

View File

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

View File

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

View File

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

View File

@@ -38,4 +38,3 @@
pip:
name: '{{ gated_project_name }}'
state: absent

View File

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

View File

@@ -1,3 +1,4 @@
---
- name: Inject into image and install packages
include_role:
name: modify-image

View File

@@ -1,3 +1,4 @@
---
- name: Setup repos on live host
shell: >
set -o pipefail &&

View File

@@ -1,3 +1,4 @@
---
- name: gather facts used by role
setup:
gather_subset: "!min,pkg_mgr"

View File

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

View File

@@ -1,3 +1,4 @@
---
- name: ensure libguestfs is installed
yum: name=libguestfs-tools-c state=latest
become: true
@@ -61,4 +62,3 @@
args:
chdir: "{{ modify_image_working_dir }}"
with_items: "{{ modify_image_extract_list }}"

View File

@@ -2,9 +2,9 @@
- name: make sure an image and script are provided
fail:
msg:
"In order to use this role image_to_modify and modify_script must be
provided."
msg: |
In order to use this role image_to_modify and modify_script must be
provided.
when: image_to_modify is not defined or (modify_script is not defined and modify_image_upload_files == [])
- include: libguestfs.yml

View File

@@ -1,3 +1,4 @@
---
os_region: "{{ lookup('env', 'OS_REGION_NAME')|default('regionOne') }}"
os_tenant: "{{ lookup('env', 'OS_TENANT_ID') }}"
os_identity_api_version: "{{ lookup('env', 'OS_IDENTITY_API_VERSION')|default(2) }}"

View File

@@ -1,3 +1,4 @@
---
- name: Delete stack
shell: >
echo "Executing 'openstack stack delete {{ stack_name }} --yes'" >> {{ stack_log }};

View File

@@ -1,3 +1,4 @@
---
- name: Fail if no auth is provided
fail:
msg: 'Please source credential rc file from your tenant on cloud'
@@ -147,13 +148,14 @@
- "{{ groups['subnodes'] }}"
# In case of blank centos image we need to create CI user and update inventory
- block:
- when: hostvars['subnode-0'].ansible_user != "{{ nodepool_user }}"
block:
- name: Setup user
user:
name: "{{ nodepool_user }}"
groups: wheel
append: yes
append: true
become: true
delegate_to: "{{ item}}"
with_items:
@@ -194,7 +196,6 @@
subnode_private_ip: "{{ item.1.0 }}"
with_indexed_items:
- "{{ subnode_ips.stdout }}"
when: hostvars['subnode-0'].ansible_user != "{{ nodepool_user }}"
- name: Dump hosts to file
template:

View File

@@ -1,3 +1,4 @@
---
heat_template_version: newton
description: >

View File

@@ -1,3 +1,4 @@
---
heat_template_version: newton
description: >

View File

@@ -1,3 +1,4 @@
---
nodepool_cirros_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
nodepool_cirros_dest: /opt/cache/files/cirros-0.3.5-x86_64-disk.img
nodepool_cirros_checksum: md5:f8ab98ff5e73ebab884d80c9dc9c7290

View File

@@ -9,7 +9,7 @@
- name: Create /etc/nodepool/node_private
lineinfile:
create: yes
create: true
state: present
name: /etc/nodepool/node_private
owner: "{{ ansible_user }}"
@@ -18,7 +18,7 @@
- name: Create /etc/nodepool/primary_node_private
lineinfile:
create: yes
create: true
state: present
name: /etc/nodepool/primary_node_private
owner: "{{ ansible_user }}"
@@ -46,7 +46,7 @@
- name: Create /etc/nodepool/sub_nodes
lineinfile:
create: yes
create: true
state: present
name: /etc/nodepool/sub_nodes
line: "{{ hostvars[item].subnode_public_ip }}"
@@ -61,7 +61,7 @@
- name: Create /etc/nodepool/sub_nodes_private
lineinfile:
create: yes
create: true
state: present
name: /etc/nodepool/sub_nodes_private
line: "{{ hostvars[item].subnode_private_ip }}"

View File

@@ -98,7 +98,7 @@
service:
name: unbound
state: started
enabled: yes
enabled: true
become: true
- name: start iptables service

View File

@@ -1,3 +1,4 @@
---
- name: Check if repo should be changed
set_fact:
proj: "{{ repo_item.replace('.git', '').split('/')[-2:]|join('/') }}:"

View File

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

View File

@@ -135,20 +135,21 @@
undercloud_ip: "{{ undercloud_ip }}"
- name: Wait for provisioned host to become reachable
command:
command: |
ssh -o BatchMode=yes -o "StrictHostKeyChecking=no" root@{{ undercloud_ip }} -i "{{ undercloud_key }}"
register: result
until: result is success
retries: 300
delay: 5
- block:
- when: ovb_setup_user|default('false')|bool
block:
- name: Setup user
user:
name: "{{ nodepool_user }}"
groups: wheel
append: yes
append: true
become: true
delegate_to: undercloud
@@ -181,8 +182,6 @@
subnode_public_ip: "{{ undercloud_ip }}"
subnode_private_ip: 192.168.23.23
when: ovb_setup_user|default('false')|bool
- name: Build nodes.json file to be used as instackenv.json
shell: >
chdir={{ local_working_dir }}
@@ -201,4 +200,3 @@
src: ovb_hosts.j2
dest: '{{ local_working_dir }}/ovb_hosts'
when: ovb_dump_hosts|default('false')|bool

View File

@@ -34,4 +34,3 @@
file:
path: "{{ local_working_dir }}/clouds.yaml"
state: absent

View File

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

View File

@@ -1,3 +1,4 @@
---
# Generate a script from templates. These are scripts
# rather than additional ansible tasks so that they can be run
# manually from the undercloud host.

View File

@@ -1,2 +1,3 @@
---
parameters:
Controller-1::NeutronExternalNetworkBridge: "''"

View File

@@ -1,3 +1,4 @@
---
hw_env:
env_type: virt
libvirt_type: qemu

View File

@@ -1,3 +1,4 @@
---
hw_env:
env_type: virt
libvirt_type: qemu

View File

@@ -1,3 +1,4 @@
---
hw_env:
env_type: virt
libvirt_type: qemu

View File

@@ -1,3 +1,4 @@
---
parameters:
ServiceNetMap:
NeutronTenantNetwork: tenant

View File

@@ -1,3 +1,4 @@
---
dependencies:
- tripleo
- extras-common

View File

@@ -1,3 +1,4 @@
---
# Generate a number of scripts from templates. These are scripts
# rather than additional ansible tasks so that they can be run
# manually from the undercloud host.

View File

@@ -1,9 +1,10 @@
---
- name: Deploy the overcloud
shell: >
set -o pipefail &&
{{ working_dir }}/overcloud-deploy.sh 2>&1 {{ timestamper_cmd }} > {{ deploy_log }}
register: deploy_script_result
ignore_errors: True
ignore_errors: true
when: step_deploy_overcloud|bool
- name: Export actual used deploy args for persistence to other plays

View File

@@ -1,3 +1,4 @@
---
- include: pre-deploy.yml
tags:
- overcloud-scripts

View File

@@ -1,3 +1,4 @@
---
# This makes the overcloudrc file available locally. This file
# contains credentials for accessing OpenStack API services on the
# overcloud.

View File

@@ -1,3 +1,4 @@
---
# Note.. the order of heat templates and args is very important. The last environment that sets a variable takes precedent.
- name: Deprecation message for network isolation types
@@ -273,4 +274,3 @@
when:
- ci_job_end_time is defined
- '"ovb" not in lookup("env", "TOCI_JOBTYPE")'

View File

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

View File

@@ -1,3 +1,4 @@
---
dependencies:
- extras-common
- container-prep

View File

@@ -1,3 +1,4 @@
---
# Create the scripts that will be used to setup the overcloud images
- name: set the service environments for container image prepare

View File

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

View File

@@ -1,3 +1,4 @@
---
# Creat the scripts that will be used to setup flavors for the overcloud
- name: Create overcloud-prep-flavors script

View File

@@ -1,3 +1,4 @@
---
- include: create-scripts.yml
tags:
- undercloud-scripts

View File

@@ -1,3 +1,4 @@
---
- name: Prepare the scripts for overcloud flavors
shell: >
set -o pipefail &&

View File

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

View File

@@ -1,3 +1,4 @@
---
# Create the scripts that will be used to setup the overcloud images
- name: Create overcloud prep-images script

View File

@@ -1,3 +1,4 @@
---
- include: create-scripts.yml
tags:
- undercloud-scripts

View File

@@ -1,3 +1,4 @@
---
- name: Prepare the overcloud images for deploy
shell: >
set -o pipefail &&

View File

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

View File

@@ -1,3 +1,4 @@
---
# Creat the overcloud-prep-network scripts that will be used to setup the undercloud for network isolation
- name: Create overcloud-prep-network script

View File

@@ -1,3 +1,4 @@
---
- include: create-scripts.yml
tags:
- undercloud-scripts

View File

@@ -1,3 +1,4 @@
---
- name: Prepare the network-isolation required networks on the undercloud
shell: >
set -o pipefail &&

View File

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

View File

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

View File

@@ -1,3 +1,4 @@
---
- name: Enable kvm nested virtualization
block:
- name: Check cpu vendor

View File

@@ -1,3 +1,4 @@
---
# By default the role does nothing since both operations
# are potentially destructive.
snapshot_create: false

View File

@@ -1,3 +1,4 @@
---
dependencies:
- extras-common
- container-prep

View File

@@ -29,4 +29,3 @@
shell: >
set -o pipefail &&
{{ working_dir }}/standalone-upgrade.sh 2>&1 {{ timestamper_cmd }} > {{ working_dir }}/{{ standalone_upgrade_log }}

View File

@@ -1,3 +1,4 @@
---
dependencies:
- extras-common
- container-prep

View File

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

View File

@@ -1,10 +1,10 @@
---
val_working_dir: "{{ working_dir }}"
run_tripleo_validations: False
run_tripleo_validations_negative_tests: False
run_tripleo_validations_setup: False
exit_on_validations_failure: False
run_tripleo_validations: false
run_tripleo_validations_negative_tests: false
run_tripleo_validations_setup: false
exit_on_validations_failure: false
# Tripleo-validations group name of tests, should be either pre-introspection,
# pre-deployment or post-deployment.

View File

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

View File

@@ -1,8 +1,9 @@
---
- name: Ensure tripleo-validations rpm requirements are installed
yum: name=openstack-tripleo-validations state=present
yum:
name: openstack-tripleo-validations
state: present
become: true
- name: Create run-tripleo-validations.sh
@@ -31,4 +32,3 @@
src: "{{ run_postdep_val_script }}"
dest: "{{ val_working_dir }}/run-postdep-validations-negative-tests.sh"
mode: 0755

View File

@@ -60,4 +60,3 @@
when: '"pre-introspection" in validations_group'
tags:
- tripleo-validations

View File

@@ -1,3 +1,4 @@
---
dependencies:
- extras-common
- container-prep

View File

@@ -1,3 +1,4 @@
---
# Creat the scripts that will be used to deploy the undercloud
# environment.
- name: Check the dns information provided by the virthost
@@ -99,10 +100,10 @@
mode: 0600
- name: Create containers-prepare-parameter.yaml
when: containerized_undercloud|bool or containerized_overcloud|bool
block:
- name: Write containers-prepare-parameter.yaml
template:
src: containers-prepare-parameter.yaml.j2
dest: "{{ working_dir }}/containers-prepare-parameter.yaml"
when: containerized_undercloud|bool or containerized_overcloud|bool

Some files were not shown because too many files have changed in this diff Show More