Enable yamllint for ansible playbook .yml files
Enabling yamllint for the ansible playbook .yml files. Modified the default yamllint configuration to ignore some minor issues so yamllint will pass. Made some very basic formatting changes to the playbook files to address basic warnings/errors and get the maximum line length to 125 characters. Change-Id: I3b6adf77025dceeb168222ff154a98178d2bb7aa Story: 2004695 Task: 34286 Signed-off-by: Bart Wensley <barton.wensley@windriver.com>
This commit is contained in:
parent
e709a1de2a
commit
46be1e020a
12
.yamllint
Normal file
12
.yamllint
Normal file
@ -0,0 +1,12 @@
|
||||
extends: default
|
||||
|
||||
rules:
|
||||
braces:
|
||||
min-spaces-inside: 1
|
||||
max-spaces-inside: 1
|
||||
indentation:
|
||||
indent-sequences: whatever
|
||||
line-length:
|
||||
max: 125
|
||||
truthy:
|
||||
allowed-values: ['true', 'false', 'yes', 'no']
|
@ -70,8 +70,8 @@ management_multicast_subnet: 239.1.1.0/28
|
||||
# mangement_multicast_start_address:
|
||||
# management_multicast_end_address:
|
||||
|
||||
# Management network address allocation (True = dynamic, False = static)
|
||||
dynamic_address_allocation: True
|
||||
# Management network address allocation (true = dynamic, false = static)
|
||||
dynamic_address_allocation: true
|
||||
|
||||
# DOCKER PROXIES
|
||||
# ==============
|
||||
|
@ -70,7 +70,9 @@
|
||||
timeout: "{{ pods_wait_time }}"
|
||||
|
||||
- name: Start parallel tasks to wait for Kubernetes component, Networking and Tiller pods to reach ready state
|
||||
command: kubectl --kubeconfig=/etc/kubernetes/admin.conf wait --namespace=kube-system --for=condition=Ready pods --selector {{ item }} --timeout=30s
|
||||
command: >-
|
||||
kubectl --kubeconfig=/etc/kubernetes/admin.conf wait --namespace=kube-system
|
||||
--for=condition=Ready pods --selector {{ item }} --timeout=30s
|
||||
async: 30
|
||||
poll: 0
|
||||
with_items:
|
||||
|
@ -43,10 +43,16 @@
|
||||
- name: Set facts derived from previous network configurations
|
||||
set_fact:
|
||||
prev_management_subnet_prefix: "{{ prev_management_subnet | ipaddr('prefix') }}"
|
||||
prev_controller_floating_address: "{{ (prev_management_subnet | ipaddr(2)).split('/')[0] if prev_management_start_address == 'derived' else prev_management_start_address }}"
|
||||
prev_cluster_floating_address: "{{ (prev_cluster_host_subnet | ipaddr(2)).split('/')[0] if prev_cluster_host_start_address == 'derived' else prev_cluster_host_start_address }}"
|
||||
prev_controller_floating_address:
|
||||
"{{ (prev_management_subnet | ipaddr(2)).split('/')[0]
|
||||
if prev_management_start_address == 'derived' else prev_management_start_address }}"
|
||||
prev_cluster_floating_address:
|
||||
"{{ (prev_cluster_host_subnet | ipaddr(2)).split('/')[0]
|
||||
if prev_cluster_host_start_address == 'derived' else prev_cluster_host_start_address }}"
|
||||
prev_cluster_subnet_prefix: "{{ prev_cluster_host_subnet | ipaddr('prefix') }}"
|
||||
prev_controller_pxeboot_floating_address: "{{ (prev_pxeboot_subnet | ipaddr(2)).split('/')[0] if prev_pxeboot_start_address == 'derived' else prev_pxeboot_start_address }}"
|
||||
prev_controller_pxeboot_floating_address:
|
||||
"{{ (prev_pxeboot_subnet | ipaddr(2)).split('/')[0]
|
||||
if prev_pxeboot_start_address == 'derived' else prev_pxeboot_start_address }}"
|
||||
prev_pxe_subnet_prefix: "{{ prev_pxeboot_subnet | ipaddr('prefix') }}"
|
||||
|
||||
- name: Set facts derived from previous floating addresses
|
||||
|
@ -1,3 +1,9 @@
|
||||
---
|
||||
#
|
||||
# Copyright (c) 2019 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
- name: 'Fail if cgts-vg group is not found'
|
||||
fail: msg='Volume groups not configured.'
|
||||
when: vg_result.rc != 0
|
||||
|
@ -190,55 +190,110 @@
|
||||
set_fact:
|
||||
address_pairs:
|
||||
pxeboot:
|
||||
start: "{{ pxeboot_start_address if pxeboot_start_address != 'derived' else default_pxeboot_start_address }}"
|
||||
end: "{{ pxeboot_end_address if pxeboot_end_address != 'derived' else default_pxeboot_end_address }}"
|
||||
start:
|
||||
"{{ pxeboot_start_address if pxeboot_start_address != 'derived'
|
||||
else default_pxeboot_start_address }}"
|
||||
end:
|
||||
"{{ pxeboot_end_address if pxeboot_end_address != 'derived'
|
||||
else default_pxeboot_end_address }}"
|
||||
subnet: "{{ network_params.pxeboot_subnet }}"
|
||||
use_default: "{{ true if pxeboot_start_address == 'derived' and pxeboot_end_address == 'derived' else false }}"
|
||||
use_default:
|
||||
"{{ true if pxeboot_start_address == 'derived' and
|
||||
pxeboot_end_address == 'derived' else false }}"
|
||||
management:
|
||||
start: "{{ management_start_address if management_start_address != 'derived' else default_management_start_address }}"
|
||||
end: "{{ management_end_address if management_end_address != 'derived' else default_management_end_address }}"
|
||||
start:
|
||||
"{{ management_start_address if management_start_address != 'derived'
|
||||
else default_management_start_address }}"
|
||||
end:
|
||||
"{{ management_end_address if management_end_address != 'derived'
|
||||
else default_management_end_address }}"
|
||||
subnet: "{{ network_params.management_subnet }}"
|
||||
use_default: "{{ true if management_start_address == 'derived' and management_end_address == 'derived' else false }}"
|
||||
use_default:
|
||||
"{{ true if management_start_address == 'derived' and
|
||||
management_end_address == 'derived' else false }}"
|
||||
cluster_host:
|
||||
start: "{{ cluster_host_start_address if cluster_host_start_address != 'derived' else default_cluster_host_start_address }}"
|
||||
end: "{{ cluster_host_end_address if cluster_host_end_address != 'derived' else default_cluster_host_end_address}}"
|
||||
start:
|
||||
"{{ cluster_host_start_address if cluster_host_start_address != 'derived'
|
||||
else default_cluster_host_start_address }}"
|
||||
end:
|
||||
"{{ cluster_host_end_address if cluster_host_end_address != 'derived'
|
||||
else default_cluster_host_end_address}}"
|
||||
subnet: "{{ network_params.cluster_host_subnet }}"
|
||||
use_default: "{{ true if cluster_host_start_address == 'derived' and cluster_host_end_address == 'derived' else false }}"
|
||||
use_default:
|
||||
"{{ true if cluster_host_start_address == 'derived' and
|
||||
cluster_host_end_address == 'derived' else false }}"
|
||||
cluster_pod:
|
||||
start: "{{ cluster_pod_start_address if cluster_pod_start_address != 'derived' else default_cluster_pod_start_address }}"
|
||||
end: "{{ cluster_pod_end_address if cluster_pod_end_address != 'derived' else default_cluster_pod_end_address }}"
|
||||
start:
|
||||
"{{ cluster_pod_start_address if cluster_pod_start_address != 'derived'
|
||||
else default_cluster_pod_start_address }}"
|
||||
end:
|
||||
"{{ cluster_pod_end_address if cluster_pod_end_address != 'derived'
|
||||
else default_cluster_pod_end_address }}"
|
||||
subnet: "{{ network_params.cluster_pod_subnet }}"
|
||||
use_default: "{{ true if cluster_pod_start_address == 'derived' and cluster_pod_end_address == 'derived' else false }}"
|
||||
use_default:
|
||||
"{{ true if cluster_pod_start_address == 'derived' and
|
||||
cluster_pod_end_address == 'derived' else false }}"
|
||||
cluster_service:
|
||||
start: "{{ cluster_service_start_address if cluster_service_start_address != 'derived' else default_cluster_service_start_address }}"
|
||||
end: "{{ cluster_service_end_address if cluster_service_end_address != 'derived' else default_cluster_service_end_address }}"
|
||||
start:
|
||||
"{{ cluster_service_start_address if cluster_service_start_address != 'derived'
|
||||
else default_cluster_service_start_address }}"
|
||||
end:
|
||||
"{{ cluster_service_end_address if cluster_service_end_address != 'derived'
|
||||
else default_cluster_service_end_address }}"
|
||||
subnet: "{{ network_params.cluster_service_subnet }}"
|
||||
use_default: "{{ true if cluster_service_start_address == 'derived' and cluster_service_end_address == 'derived' else false }}"
|
||||
use_default:
|
||||
"{{ true if cluster_service_start_address == 'derived' and
|
||||
cluster_service_end_address == 'derived' else false }}"
|
||||
oam:
|
||||
start: "{{ external_oam_start_address if external_oam_start_address != 'derived' else default_external_oam_start_address }}"
|
||||
end: "{{ external_oam_end_address if external_oam_end_address != 'derived' else default_external_oam_end_address }}"
|
||||
start:
|
||||
"{{ external_oam_start_address if external_oam_start_address != 'derived'
|
||||
else default_external_oam_start_address }}"
|
||||
end:
|
||||
"{{ external_oam_end_address if external_oam_end_address != 'derived'
|
||||
else default_external_oam_end_address }}"
|
||||
subnet: "{{ network_params.external_oam_subnet }}"
|
||||
use_default: "{{ true if external_oam_start_address == 'derived' and external_oam_end_address == 'derived' else false }}"
|
||||
use_default:
|
||||
"{{ true if external_oam_start_address == 'derived' and
|
||||
external_oam_end_address == 'derived' else false }}"
|
||||
multicast:
|
||||
start: "{{ management_multicast_start_address if management_multicast_start_address != 'derived' else default_management_multicast_start_address }}"
|
||||
end: "{{ management_multicast_end_address if management_multicast_end_address != 'derived' else default_management_multicast_end_address }}"
|
||||
start:
|
||||
"{{ management_multicast_start_address if management_multicast_start_address != 'derived'
|
||||
else default_management_multicast_start_address }}"
|
||||
end:
|
||||
"{{ management_multicast_end_address if management_multicast_end_address != 'derived'
|
||||
else default_management_multicast_end_address }}"
|
||||
subnet: "{{ network_params.management_multicast_subnet }}"
|
||||
use_default: "{{ true if management_multicast_start_address == 'derived' and management_multicast_end_address == 'derived' else false }}"
|
||||
use_default:
|
||||
"{{ true if management_multicast_start_address == 'derived' and
|
||||
management_multicast_end_address == 'derived' else false }}"
|
||||
oam_node:
|
||||
start: "{{ external_oam_node_0_address if external_oam_node_0_address != 'derived' else default_external_oam_node_0_address }}"
|
||||
end: "{{ external_oam_node_1_address if external_oam_node_1_address != 'derived' else default_external_oam_node_1_address }}"
|
||||
start:
|
||||
"{{ external_oam_node_0_address if external_oam_node_0_address != 'derived'
|
||||
else default_external_oam_node_0_address }}"
|
||||
end:
|
||||
"{{ external_oam_node_1_address if external_oam_node_1_address != 'derived'
|
||||
else default_external_oam_node_1_address }}"
|
||||
subnet: "{{ network_params.external_oam_subnet }}"
|
||||
use_default: "{{ true if external_oam_node_0_address == 'derived' and external_oam_node_1_address == 'derived' else false }}"
|
||||
use_default:
|
||||
"{{ true if external_oam_node_0_address == 'derived' and
|
||||
external_oam_node_1_address == 'derived' else false }}"
|
||||
|
||||
- include: validate_address_range.yml
|
||||
with_dict: "{{ address_pairs }}"
|
||||
|
||||
- name: Set floating addresses based on subnets or start addresses
|
||||
set_fact:
|
||||
# Not sure why ipaddr('address') and ipsubnet filter did not extract the IP from CIDR input. Resort to string split for now.
|
||||
controller_floating_address: "{{ (management_subnet | ipaddr(2)).split('/')[0] if management_start_address == 'derived' else management_start_address }}"
|
||||
controller_pxeboot_floating_address: "{{ (pxeboot_subnet | ipaddr(2)).split('/')[0] if pxeboot_start_address == 'derived' else pxeboot_start_address }}"
|
||||
cluster_floating_address: "{{ (cluster_host_subnet | ipaddr(2)).split('/')[0] if cluster_host_start_address == 'derived' else cluster_host_start_address }}"
|
||||
# Not sure why ipaddr('address') and ipsubnet filter did not extract
|
||||
# the IP from CIDR input. Resort to string split for now.
|
||||
controller_floating_address:
|
||||
"{{ (management_subnet | ipaddr(2)).split('/')[0] if management_start_address == 'derived'
|
||||
else management_start_address }}"
|
||||
controller_pxeboot_floating_address:
|
||||
"{{ (pxeboot_subnet | ipaddr(2)).split('/')[0] if pxeboot_start_address == 'derived'
|
||||
else pxeboot_start_address }}"
|
||||
cluster_floating_address:
|
||||
"{{ (cluster_host_subnet | ipaddr(2)).split('/')[0] if cluster_host_start_address == 'derived'
|
||||
else cluster_host_start_address }}"
|
||||
|
||||
- name: Set derived facts for subsequent tasks/roles
|
||||
set_fact:
|
||||
@ -280,10 +335,18 @@
|
||||
- block:
|
||||
- set_fact:
|
||||
use_default_registries: true
|
||||
k8s_registry: "{{ docker_registries[default_k8s_registry] if docker_registries[default_k8s_registry] is not none else default_k8s_registry }}"
|
||||
gcr_registry: "{{ docker_registries[default_gcr_registry] if docker_registries[default_gcr_registry] is not none else default_gcr_registry }}"
|
||||
quay_registry: "{{ docker_registries[default_quay_registry] if docker_registries[default_quay_registry] is not none else default_quay_registry }}"
|
||||
docker_registry: "{{ docker_registries[default_docker_registry] if docker_registries[default_docker_registry] is not none else default_docker_registry }}"
|
||||
k8s_registry:
|
||||
"{{ docker_registries[default_k8s_registry] if docker_registries[default_k8s_registry] is not none
|
||||
else default_k8s_registry }}"
|
||||
gcr_registry:
|
||||
"{{ docker_registries[default_gcr_registry] if docker_registries[default_gcr_registry] is not none
|
||||
else default_gcr_registry }}"
|
||||
quay_registry:
|
||||
"{{ docker_registries[default_quay_registry] if docker_registries[default_quay_registry] is not none
|
||||
else default_quay_registry }}"
|
||||
docker_registry:
|
||||
"{{ docker_registries[default_docker_registry] if docker_registries[default_docker_registry] is not none
|
||||
else default_docker_registry }}"
|
||||
default_no_proxy:
|
||||
- localhost
|
||||
- 127.0.0.1
|
||||
@ -331,7 +394,7 @@
|
||||
|
||||
- name: Default the unified registry to secure if not specified
|
||||
set_fact:
|
||||
is_secure_registry: True
|
||||
is_secure_registry: true
|
||||
when: is_secure_registry is not defined
|
||||
|
||||
- name: Turn on use_unified_registry flag
|
||||
|
@ -9,4 +9,4 @@ minimum_ipv6_prefix_length: 64
|
||||
|
||||
private_pxeboot_subnet: 169.254.202.0/24
|
||||
pxecontroller_floating_hostname: pxecontroller
|
||||
use_entire_pxeboot_subnet: True
|
||||
use_entire_pxeboot_subnet: true
|
||||
|
Loading…
Reference in New Issue
Block a user