Skip to content

Commit

Permalink
yamllint: Make the repo yamllintable
Browse files Browse the repository at this point in the history
  • Loading branch information
Spredzy committed Dec 9, 2019
1 parent 4c7b0d2 commit d9e3134
Show file tree
Hide file tree
Showing 183 changed files with 1,645 additions and 1,536 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ secrets.yml
users.yml
extra_vars.yml
*.txt
!test-requirements.txt
*.vagrant
TODO
TODO.md
Expand All @@ -27,3 +28,4 @@ provisioner/roles/geerlingguy.repo-epel/
Gemfile.lock
Gemfile
_site/*
.tox/
14 changes: 14 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
extends: default

ignore: |
.tox

rules:
braces:
max-spaces-inside: 1
level: error
brackets:
max-spaces-inside: 1
level: error
line-length: disable
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
theme: jekyll-theme-dinky
include:
- "provisioner/README.md"
Expand Down
10 changes: 5 additions & 5 deletions demos/chatops/chatops_pb/check_acls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: TOWER TEMPLATE
hosts: all
connection: network_cli
gather_facts: no
gather_facts: false

vars:
response_url: ''
Expand All @@ -25,20 +25,20 @@
path: acl_report
insertbefore: BOF
line: '{ "text": "@{{slack_user}} ```'
run_once: yes
run_once: true

- name: LINEINFILE INSERT AFTER
lineinfile:
path: acl_report
insertafter: EOF
line: '``` "}'
run_once: yes
run_once: true

- name: SEND RESPONSE TO SLACK
uri:
url: "{{response_url}}"
body: "{{ lookup('file','acl_report') }}"
method: POST
validate_certs: no
validate_certs: false
delegate_to: localhost
run_once: yes
run_once: true
1 change: 1 addition & 0 deletions demos/chatops/demo_setup/input_vars.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
slash_cmd: acl
slack_interactive: interactive-component
slack_token: axxxxxxxxxxxxxxxxxxxx
Expand Down
8 changes: 4 additions & 4 deletions demos/chatops/demo_setup/roles/genie-survey/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
tower_url: ""
tower_verify_ssl: False
tower_secrets: False
tower_verify_ssl: false
tower_secrets: false
tower_user: ""
tower_pass: "" #Put in a vault at vars/tower-secrets.yml when tower_secrets: True
tower_pass: "" # Put in a vault at vars/tower-secrets.yml when tower_secrets: True
tower_surveys: []
#some examples:
# some examples:
# tower_surveys:
# - job_template_name: "testing"
# #job_template_survey_enabled: can be either True|False
Expand Down
9 changes: 5 additions & 4 deletions demos/chatops/demo_setup/roles/genie-survey/meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
galaxy_info:
author: "Andrew J. Huffman"
description: "An Ansible Role to deploy and ensure job template surveys are in a desired state in Ansible Tower."
Expand All @@ -14,7 +15,7 @@ galaxy_info:
# - GPLv3
# - Apache
# - CC-BY
#license: "MIT"
# license: "MIT"

min_ansible_version: 2.5

Expand All @@ -27,7 +28,7 @@ galaxy_info:
# this branch. If Travis integration is configured, only notifications for this
# branch will be accepted. Otherwise, in all cases, the repo's default branch
# (usually master) will be used.
#github_branch:
# github_branch:

#
# platforms is a list of platforms, and each platform has a name and a list of versions.
Expand Down Expand Up @@ -55,5 +56,5 @@ galaxy_info:
# Maximum 20 tags per role.

dependencies: []
# List your role dependencies here, one per line. Be sure to remove the '[]' above,
# if you add dependencies to this list.
# List your role dependencies here, one per line. Be sure to remove the '[]' above,
# if you add dependencies to this list.
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
label: "{{ survey_field.variable }}"
when: "job_template.survey | length > 0"

#Get job template id
# Get job template id
- name: "Retrieve and set Ansible Tower job template ID"
block:
- name: "Retrieve Ansible Tower job template ID"
uri:
url: "{{ tower_url }}/api/v2/job_templates/"
user: "{{ tower_user }}"
password: "{{ tower_pass }}"
force_basic_auth: True
force_basic_auth: true
method: "GET"
status_code: "200"
validate_certs: "{{ tower_verify_ssl }}"
register: "tower_job_templates"
changed_when: False
no_log: True
changed_when: false
no_log: true

- name: "Initialize Ansible Tower job template data"
set_fact:
Expand Down Expand Up @@ -56,13 +56,13 @@
url: "{{ tower_url }}/api/v2/job_templates/{{ job_template_id }}/survey_spec/"
user: "{{ tower_user }}"
password: "{{ tower_pass }}"
force_basic_auth: True
force_basic_auth: true
method: "GET"
status_code: "200"
validate_certs: "{{ tower_verify_ssl }}"
register: "tower_job_template_current_survey"
changed_when: False
no_log: True
changed_when: false
no_log: true

# Update survey spec when not in desired state if different than existing
- name: "Format Ansible Tower Survey"
Expand All @@ -74,15 +74,15 @@
url: "{{ tower_url }}/api/v2/job_templates/{{ job_template_id }}/survey_spec/"
user: "{{ tower_user }}"
password: "{{ tower_pass }}"
force_basic_auth: True
force_basic_auth: true
method: "POST"
body: "{{ tower_survey_formatted | to_json }}"
body_format: "json"
status_code: "200"
validate_certs: "{{ tower_verify_ssl }}"
register: "update_survey"
changed_when: 'update_survey.status == 200'
no_log: True
no_log: true
when: 'tower_survey_formatted != tower_job_template_current_survey.json'

# Ensure survey is enabled
Expand All @@ -91,15 +91,15 @@
url: "{{ tower_url }}/api/v2/job_templates/{{ job_template_id }}/"
user: "{{ tower_user }}"
password: "{{ tower_pass }}"
force_basic_auth: True
force_basic_auth: true
method: "PATCH"
body: '{"survey_enabled": true}'
body_format: "json"
status_code: "200"
validate_certs: "{{ tower_verify_ssl }}"
register: "enable_job_template_survey"
changed_when: 'enable_job_template_survey.status == 200'
no_log: True
no_log: true
when:
- 'job_template.job_template_survey_enabled'
- 'not job_template_survey_enabled'
Expand All @@ -110,15 +110,15 @@
url: "{{ tower_url }}/api/v2/job_templates/{{ job_template_id }}/"
user: "{{ tower_user }}"
password: "{{ tower_pass }}"
force_basic_auth: True
force_basic_auth: true
method: "PATCH"
body: '{"survey_enabled": false}'
body_format: "json"
status_code: "200"
validate_certs: "{{ tower_verify_ssl }}"
register: "disable_job_template_survey"
changed_when: 'disable_job_template_survey.status == 200'
no_log: True
no_log: true
when:
- 'not job_template.job_template_survey_enabled'
- 'job_template_survey_enabled'
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,39 @@

- name: "Add survey field | float"
set_fact:
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: "{{ survey_field.min | default('0') }}", default: "{{ survey_field.default | default('') }}", max: "{{ survey_field.max | default('100') }}", required: "{{ survey_field.required }}", choices: "", new_question: True, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "float"}]
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: "{{ survey_field.min | default('0') }}", default: "{{ survey_field.default | default('') }}", max: "{{ survey_field.max | default('100') }}", required: "{{ survey_field.required }}", choices: "", new_question: true, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "float"}]
when: 'survey_field.type == "float"'


- name: "Add survey field | integer"
set_fact:
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: "{{ survey_field.min | default('0') }}", default: "{{ survey_field.default | default('') }}", max: "{{ survey_field.max | default('100') }}", required: "{{ survey_field.required }}", choices: "", new_question: True, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "integer"}]
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: "{{ survey_field.min | default('0') }}", default: "{{ survey_field.default | default('') }}", max: "{{ survey_field.max | default('100') }}", required: "{{ survey_field.required }}", choices: "", new_question: true, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "integer"}]
when: 'survey_field.type == "integer"'

- name: "Add survey field | multiple-choice multiple-select"
set_fact:
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: null, default: "{{ survey_field.default | join('\n') | default('') }}", max: null, required: "{{ survey_field.required }}", choices: "{{ survey_field.choices | join('\n') }}", new_question: True, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "multiselect"}]
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: null, default: "{{ survey_field.default | join('\n') | default('') }}", max: null, required: "{{ survey_field.required }}", choices: "{{ survey_field.choices | join('\n') }}", new_question: true, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "multiselect"}]
when: 'survey_field.type == "multiselect"'

- name: "Add survey field | multiple-choice single-select"
set_fact:
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: null, default: "{{ survey_field.default | default('') }}", max: null, required: "{{ survey_field.required }}", choices: "{{ survey_field.choices | join('\n') }}", new_question: True, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "multiplechoice"}]
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: null, default: "{{ survey_field.default | default('') }}", max: null, required: "{{ survey_field.required }}", choices: "{{ survey_field.choices | join('\n') }}", new_question: true, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "multiplechoice"}]
when: 'survey_field.type == "multiplechoice"'

- name: "Add survey field | password"
set_fact:
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: "{{ survey_field.min | default('0') }}", default: "", max: "{{ survey_field.max | default('32') }}", required: "{{ survey_field.required }}", choices: "", new_question: True, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "password"}]
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: "{{ survey_field.min | default('0') }}", default: "", max: "{{ survey_field.max | default('32') }}", required: "{{ survey_field.required }}", choices: "", new_question: true, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "password"}]
when: 'survey_field.type == "password"'

- name: "Add survey field | text area"
set_fact:
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: "{{ survey_field.min | default('0') }}", default: "{{ survey_field.default | default('') }}", max: "{{ survey_field.max | default('4096') }}", required: "{{ survey_field.required }}", choices: "", new_question: True, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "textarea"}]
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: "{{ survey_field.min | default('0') }}", default: "{{ survey_field.default | default('') }}", max: "{{ survey_field.max | default('4096') }}", required: "{{ survey_field.required }}", choices: "", new_question: true, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "textarea"}]
when: 'survey_field.type == "textarea"'


- name: "Add survey field | text"
set_fact:
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: 0, default: "{{ survey_field.default | default('') }}", max: 1024 , required: "{{ survey_field.required }}", choices: "", new_question: True, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "text"}]
add_survey_field: [{question_description: "{{ survey_field.description | default('') }}", min: 0, default: "{{ survey_field.default | default('') }}", max: 1024, required: "{{ survey_field.required }}", choices: "", new_question: true, variable: "{{ survey_field.variable }}", question_name: "{{ survey_field.prompt }}", type: "text"}]
when: 'survey_field.type == "text"'

- name: "Add survey field | {{ survey_field.variable }}"
Expand Down
2 changes: 1 addition & 1 deletion demos/chatops/demo_setup/roles/genie-survey/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: "Bring in vaulted Ansible Tower secrets"
include_vars: "vars/tower-secrets.yml"
when: "tower_secrets"
no_log: True
no_log: true

# Build survey spec for job template
- name: "Build Ansible Tower job template survey specification"
Expand Down
37 changes: 19 additions & 18 deletions demos/chatops/demo_setup/roles/tower_tasks/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
---
- name: CREATE INVENTORY
tower_inventory:
name: "ChatOps Inventory"
organization: Default
tower_username: admin
tower_password: ansible
tower_host: https://localhost
tower_verify_ssl: no
tower_verify_ssl: false
run_once: true
delegate_to: localhost

- name: ADD HOST INTO TOWER INVENTORY
- name: ADD HOST INTO TOWER INVENTORY
tower_host:
name: "{{ inventory_hostname }}"
inventory: "ChatOps Inventory"
tower_username: admin
tower_password: ansible
tower_host: https://localhost
tower_verify_ssl: no
tower_verify_ssl: false
variables:
ansible_network_os: "{{ansible_network_os}}"
ansible_host: "{{ansible_host}}"
Expand All @@ -32,7 +33,7 @@
tower_username: admin
tower_password: ansible
tower_host: https://localhost
tower_verify_ssl: no
tower_verify_ssl: false
run_once: true
delegate_to: localhost

Expand All @@ -45,7 +46,7 @@
tower_username: admin
tower_password: ansible
tower_host: https://localhost
tower_verify_ssl: no
tower_verify_ssl: false
run_once: true
delegate_to: localhost

Expand All @@ -62,7 +63,7 @@
tower_username: admin
tower_password: ansible
tower_host: https://localhost
tower_verify_ssl: no
tower_verify_ssl: false
run_once: true
delegate_to: localhost
when:
Expand All @@ -75,41 +76,41 @@
tower_url: https://localhost
tower_user: admin
tower_pass: ansible
tower_verify_ssl: no
tower_verify_ssl: false
tower_surveys:
- job_template_name: "Network-Validate-Traffic"
job_template_survey_enabled: True
job_template_survey_enabled: true
survey:
- variable: "protocol"
required: yes
required: true
type: text
prompt: "protocol"
- variable: "action"
required: yes
required: true
type: text
prompt: "action"
- variable: "src_network"
required: yes
required: true
type: text
prompt: "src_network"
- variable: "src_mask"
required: yes
required: true
type: text
prompt: "src_mask"
- variable: "dst_network"
required: yes
required: true
type: text
prompt: "dst_network"
- variable: "dst_mask"
required: yes
required: true
type: text
prompt: "dst_mask"
- variable: "dst_port"
required: yes
required: true
type: text
prompt: "dst_port"
- variable: "slack_user"
required: no
required: false
type: text
prompt: "slack_user"
run_once: true
Expand All @@ -130,8 +131,8 @@
tower_username: admin
tower_password: ansible
tower_host: https://localhost
tower_verify_ssl: no
survey_enabled: yes
tower_verify_ssl: false
survey_enabled: true
survey_spec: "{{ lookup('template', 'survey_spec.json') }}"
run_once: true
delegate_to: localhost
Expand Down
Loading

0 comments on commit d9e3134

Please sign in to comment.