yamllint: Make all files in awx pass yamllint

This commit updates all files that weren't passing yamllint for them to
pass.

A new yamllint target has been added. One can run `tox -e yamllint` or
`yamllint -s .` locally to ensure yaml files are still passing.

This check will be enabled in the CI so it can get on every new
contributions, and prevent merging non-compliant code.

Signed-off-by: Yanis Guenane <yguenane@redhat.com>
This commit is contained in:
Yanis Guenane
2019-11-30 19:43:23 +01:00
parent 8116ec8e1f
commit ca247182df
41 changed files with 237 additions and 204 deletions

View File

@@ -49,12 +49,12 @@
- name: Get Project Detail
shell: "oc get project {{ awx_dev_project }}"
register: project_details
ignore_errors: yes
ignore_errors: true
- name: Get Postgres Service Detail
shell: "oc describe svc postgresql -n {{ awx_dev_project }}"
register: postgres_svc_details
ignore_errors: yes
ignore_errors: true
- name: Create AWX Openshift Project
shell: "oc new-project {{ awx_dev_project }}"

View File

@@ -8,4 +8,4 @@
- awx_task_cpu_request: 500
- awx_task_mem_request: 512
roles:
- { role: minishift }
- {role: minishift}

View File

@@ -1,3 +1,4 @@
---
version: '2'
services:
haproxy:

View File

@@ -1,3 +1,4 @@
---
version: '2'
services:
# Primary AWX Development Container
@@ -48,7 +49,7 @@ services:
image: postgres:10
container_name: tools_postgres_1
ports:
- "5432:5432"
- "5432:5432"
memcached:
image: memcached:alpine
container_name: tools_memcached_1

View File

@@ -1,3 +1,4 @@
---
version: '2'
services:
# Primary Tower Development Container link
@@ -21,7 +22,8 @@ services:
environment:
DATABASE_URL: postgres://postgres@postgres/postgres
CONJUR_DATA_KEY: 'dveUwOI/71x9BPJkIgvQRRBF3SdASc+HP4CUGL7TKvM='
depends_on: [ postgres ]
depends_on:
- postgres
links:
- postgres
ports:

View File

@@ -1,3 +1,4 @@
---
version: '2'
services:
# Primary Tower Development Container link

View File

@@ -1,3 +1,4 @@
---
# Structure for the Elastic Stack docker configuration came from docker-elk:
# https://github.com/deviantony/docker-elk
# docker-elk is under the MIT License,
@@ -15,8 +16,8 @@ services:
- "9300:9300"
environment:
ES_JAVA_OPTS: "-Xms1g -Xmx1g"
# networks: # add back in when a connection to tower_tools is possible
# - docker_elk
# networks: # add back in when a connection to tower_tools is possible
# - docker_elk
logstash:
build: elastic/logstash/

View File

@@ -1,3 +1,4 @@
---
version: '2'
services:
# Tower Development Cluster
@@ -9,4 +10,4 @@ services:
- logstash
tower_3:
links:
- logstash
- logstash

View File

@@ -1,3 +1,4 @@
---
version: '2'
services:
# Primary Tower Development Container

View File

@@ -1,3 +1,4 @@
---
# Kibana is served by a back end server. This setting specifies the port to use.
server.port: 5601
@@ -89,4 +90,4 @@ elasticsearch.url: "http://elasticsearch:9200"
# Set the interval in milliseconds to sample system and process performance
# metrics. Minimum is 100ms. Defaults to 10000.
# ops.interval: 10000
# ops.interval: 10000

View File

@@ -1,21 +1,22 @@
---
# prometheus.yml
# my global config
global:
scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
# scrape_timeout is set to the global default (10s).
scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
# scrape_timeout is set to the global default (10s).
# Alertmanager configuration
alerting:
alertmanagers:
- static_configs:
- targets:
- static_configs:
- targets:
# - alertmanager:9093
# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
rule_files:
# - "first_rules.yml"
# - "second_rules.yml"
# - "first_rules.yml"
# - "second_rules.yml"
# A scrape configuration containing exactly one endpoint to scrape:
@@ -23,14 +24,14 @@ rule_files:
scrape_configs:
# The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
- job_name: 'prometheus'
# metrics_path defaults to '/metrics'
# scheme defaults to 'http'.
# metrics_path defaults to '/metrics'
# scheme defaults to 'http'.
static_configs:
- targets: ['127.0.0.1:9090']
- targets: ['127.0.0.1:9090']
- job_name: 'awx'
tls_config:
insecure_skip_verify: True
insecure_skip_verify: true
metrics_path: /api/v2/metrics
scrape_interval: 5s
scheme: http
@@ -42,4 +43,4 @@ scrape_configs:
# bearer_token: oauth-token
static_configs:
- targets:
- awxweb:8013
- awxweb:8013